[340934] Migrate XPath2 test suite to new API
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/JunitTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/JunitTest.java index c6e494d..4376680 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/JunitTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/JunitTest.java
@@ -39,10 +39,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -76,10 +75,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -113,10 +111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/bugTestFiles/nested-abc.xml b/tests/org.eclipse.wst.xml.xpath2.processor.tests/bugTestFiles/nested-abc.xml new file mode 100644 index 0000000..e242e0b --- /dev/null +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/bugTestFiles/nested-abc.xml
@@ -0,0 +1,18 @@ +<a> + <b> + <c/> + <c/> + <c/> + </b> + <b> + <c/> + <c/> + <c/> + </b> + <b> + <c/> + <c/> + <c/> + </b> +</a> + \ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/AbstractPsychoPathTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/AbstractPsychoPathTest.java index c17fc5c..73d82bf 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/AbstractPsychoPathTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/AbstractPsychoPathTest.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 Standards for Technology in Automotive Retail and others. + * Copyright (c) 2009, 2011 Standards for Technology in Automotive Retail and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,6 +16,7 @@ * Jesper Steen Moeller - bug 282096 - make test harness handle all string encoding * Jesper Steen Moller - bug 280555 - Add pluggable collation support * Mukul Gandhi - bug 338494 - prohibiting xpath expressions starting with / or // to be parsed. + * Jesper Steen Moller - bug 340933 - Migrate tests to new XPath2 API *******************************************************************************/ package org.eclipse.wst.xml.xpath2.processor.test; @@ -26,15 +27,22 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; +import java.lang.reflect.InvocationTargetException; import java.net.MalformedURLException; +import java.net.URISyntaxException; import java.net.URL; import java.nio.charset.Charset; +import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.xml.XMLConstants; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeConstants; +import javax.xml.datatype.DatatypeFactory; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; @@ -52,6 +60,10 @@ import org.apache.xerces.xs.XSSimpleTypeDefinition; import org.custommonkey.xmlunit.XMLTestCase; import org.eclipse.core.runtime.Platform; +import org.eclipse.wst.xml.xpath2.api.CollationProvider; +import org.eclipse.wst.xml.xpath2.api.StaticContext; +import org.eclipse.wst.xml.xpath2.api.StaticVariableResolver; +import org.eclipse.wst.xml.xpath2.api.XPath2Expression; import org.eclipse.wst.xml.xpath2.api.typesystem.TypeModel; import org.eclipse.wst.xml.xpath2.processor.DOMLoader; import org.eclipse.wst.xml.xpath2.processor.DOMLoaderException; @@ -59,6 +71,7 @@ import org.eclipse.wst.xml.xpath2.processor.DefaultEvaluator; import org.eclipse.wst.xml.xpath2.processor.DynamicContext; import org.eclipse.wst.xml.xpath2.processor.DynamicError; +import org.eclipse.wst.xml.xpath2.processor.Engine; import org.eclipse.wst.xml.xpath2.processor.Evaluator; import org.eclipse.wst.xml.xpath2.processor.JFlexCupParser; import org.eclipse.wst.xml.xpath2.processor.ResultSequence; @@ -71,17 +84,22 @@ import org.eclipse.wst.xml.xpath2.processor.ast.XPath; import org.eclipse.wst.xml.xpath2.processor.function.FnFunctionLibrary; import org.eclipse.wst.xml.xpath2.processor.function.XSCtrLibrary; +import org.eclipse.wst.xml.xpath2.processor.internal.function.FunctionLibrary; import org.eclipse.wst.xml.xpath2.processor.internal.types.AnyType; import org.eclipse.wst.xml.xpath2.processor.internal.types.DocType; import org.eclipse.wst.xml.xpath2.processor.internal.types.NodeType; import org.eclipse.wst.xml.xpath2.processor.internal.types.QName; import org.eclipse.wst.xml.xpath2.processor.internal.types.XSBoolean; +import org.eclipse.wst.xml.xpath2.processor.internal.types.builtin.BuiltinTypeLibrary; import org.eclipse.wst.xml.xpath2.processor.internal.types.userdefined.UserDefinedCtrLibrary; import org.eclipse.wst.xml.xpath2.processor.internal.types.xerces.XercesTypeModel; import org.eclipse.wst.xml.xpath2.processor.testsuite.userdefined.XercesFloatUserDefined; import org.eclipse.wst.xml.xpath2.processor.testsuite.userdefined.XercesIntegerUserDefined; import org.eclipse.wst.xml.xpath2.processor.testsuite.userdefined.XercesQNameUserDefined; import org.eclipse.wst.xml.xpath2.processor.testsuite.userdefined.XercesUserDefined; +import org.eclipse.wst.xml.xpath2.processor.util.DynamicContextBuilder; +import org.eclipse.wst.xml.xpath2.processor.util.ResultSequenceUtil; +import org.eclipse.wst.xml.xpath2.processor.util.StaticContextBuilder; import org.osgi.framework.Bundle; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -99,7 +117,10 @@ protected Document domDoc2 = null; protected Bundle bundle = null; - private DynamicContext dynamicContext = null; + private DefaultDynamicContext dynamicContext = null; + protected boolean useNewApi = false; + private StaticContextBuilder staticContextBuilder; + private DynamicContextBuilder dynamicContextBuilder; private static final String INPUT_CONTEXT = "input-context"; private static final String INPUT_CONTEXT1 = "input-context1"; @@ -121,6 +142,8 @@ System.setProperty("javax.xml.parsers.DocumentBuilderFactory", "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"); } System.setProperty("javax.xml.validation.SchemaFactory:http://www.w3.org/2001/XMLSchema","org.apache.xerces.jaxp.validation.XMLSchemaFactory"); + + staticContextBuilder = new StaticContextBuilder(); } protected void loadDOMDocument(URL fileURL) throws IOException, @@ -262,12 +285,68 @@ return xsGrammars[0].toXSModel(xsGrammars); } + + protected void setVariable(String name, ResultSequence values) { + if (useNewApi) { + staticContextBuilder.withVariable(new javax.xml.namespace.QName( + name), BuiltinTypeLibrary.XS_UNTYPEDATOMIC, + StaticVariableResolver.ANY); + dynamicContextBuilder.withVariable(new javax.xml.namespace.QName(name), values); + } else { + dynamicContext.set_variable(new QName(name), values); + } + } + + protected void setVariable(String name, AnyType value) { + if (useNewApi) { + staticContextBuilder + .withVariable(new javax.xml.namespace.QName(name), + value != null ? value.getTypeDefinition() + : BuiltinTypeLibrary.XS_UNTYPED, + StaticVariableResolver.ONE); + dynamicContextBuilder.withVariable(new javax.xml.namespace.QName(name), value); + } else { + dynamicContext.set_variable(new QName(name), value); + } + } + + void setCollationProvider(final CollationProvider cp) { + if (useNewApi) { + staticContextBuilder.withCollationProvider(cp); + } else { + dynamicContext.set_collation_provider(new org.eclipse.wst.xml.xpath2.processor.CollationProvider() { + + public Comparator get_collation(String name) { + return cp.getCollation(name); + } + }); + } + } + protected DefaultDynamicContext setupDynamicContext(XSModel schema) { - XercesTypeModel typeModel = schema != null ? new XercesTypeModel(schema) : null; + XercesTypeModel typeModel = schema != null ? new XercesTypeModel( + schema) : null; + if (useNewApi) { + staticContextBuilder.withTypeModel(typeModel); + + staticContextBuilder.withNamespace("xs", "http://www.w3.org/2001/XMLSchema"); + staticContextBuilder.withNamespace("xsd", "http://www.w3.org/2001/XMLSchema"); + staticContextBuilder.withNamespace("fn", "http://www.w3.org/2005/xpath-functions"); + staticContextBuilder.withNamespace("xml", "http://www.w3.org/XML/1998/namespace"); + + dynamicContextBuilder = new DynamicContextBuilder(staticContextBuilder); + setupVariables(dynamicContext); + try { + dynamicContextBuilder.withTimezoneOffset(DatatypeFactory.newInstance().newDuration(false/*i.e. negative*/, 0, 0, 0, 5, 0, 0)); + } catch (DatatypeConfigurationException e) { + throw new RuntimeException("Shouldn't fail here", e); + } + return null; + } + DefaultDynamicContext dc = new DefaultDynamicContext(typeModel); -// DefaultDynamicContext dc = new DefaultDynamicContext(schema, domDoc); dynamicContext = dc; - + dc.add_namespace("xs", "http://www.w3.org/2001/XMLSchema"); dc.add_namespace("xsd", "http://www.w3.org/2001/XMLSchema"); dc.add_namespace("fn", "http://www.w3.org/2005/xpath-functions"); @@ -279,32 +358,66 @@ return dc; } - protected DefaultDynamicContext setupDynamicContext2(TypeModel model) { - DefaultDynamicContext dc = new DefaultDynamicContext(model); - dynamicContext = dc; - - dc.add_namespace("xs", "http://www.w3.org/2001/XMLSchema"); - dc.add_namespace("xsd", "http://www.w3.org/2001/XMLSchema"); - dc.add_namespace("fn", "http://www.w3.org/2005/xpath-functions"); - dc.add_namespace("xml", "http://www.w3.org/XML/1998/namespace"); + protected void setCollections(Map map) { + if (useNewApi) { + dynamicContextBuilder.withCollections(map); + } else { + dynamicContext.set_collections(map); + } + } + + protected void addNamespace(String prefix, String nsURI) { + if (useNewApi) { + if (prefix == null || "".equals(prefix)) { + staticContextBuilder.withDefaultNamespace(nsURI); + } else { + staticContextBuilder.withNamespace(prefix, nsURI); + } + } else { + dynamicContext.add_namespace(prefix, nsURI); + } + } - dc.add_function_library(new FnFunctionLibrary()); - dc.add_function_library(new XSCtrLibrary()); - setupVariables(dc); - return dc; + protected void addFunctionLibrary(FunctionLibrary fl) { + if (useNewApi) { + staticContextBuilder.withFunctionLibrary(fl.getNamespace(), fl); + } else { + dynamicContext.add_function_library(fl); + } } protected void addXPathDefaultNamespace(String uri) { - dynamicContext.add_namespace(null, uri); + addNamespace(null, uri); + } + + protected void setDefaultCollation(String uri) { + if (useNewApi) { + staticContextBuilder.withDefaultCollation(uri); + } else { + dynamicContext.set_default_collation(uri); + } + + } + + private XPath2Expression newXPath = null; + private XPath oldXPath = null; + + protected void compileXPath(String xpath) throws XPathParserException, StaticError, XPathParserException { + compileXPath(null, xpath); } protected XPath compileXPath(DynamicContext dc, String xpath) throws XPathParserException, StaticError { - XPathParser xpp = new JFlexCupParser(); - XPath path = xpp.parse(xpath); - - StaticChecker name_check = new StaticNameResolver(dc); - name_check.check(path); - return path; + if (useNewApi) { + newXPath = new Engine().parseExpression(xpath, staticContextBuilder); + return null; + } else { + XPathParser xpp = new JFlexCupParser(); + XPath path = oldXPath = xpp.parse(xpath); + + StaticChecker name_check = new StaticNameResolver(dynamicContext); + name_check.check(path); + return path; + } } protected XPath compileXPath(DynamicContext dc, String xpath, boolean isRootlessAccess) throws XPathParserException, StaticError { @@ -322,6 +435,15 @@ return path; } + protected ResultSequence evaluate(Document domDoc) { + if (useNewApi) { + return ResultSequenceUtil.newToOld(newXPath.evaluate(dynamicContextBuilder, new Object[]{domDoc})); + } else { + Evaluator eval = new DefaultEvaluator(dynamicContext, domDoc); + return eval.evaluate(oldXPath); + } + } + protected String getExpectedResult(String xqFile) { return getExpectedResult(xqFile, true); } @@ -400,8 +522,17 @@ try { URL entryUrl = bundle.getEntry(xqFile); InputStream isxq = testResolve(entryUrl); - if (dynamicContext.base_uri().string_value() == null) - dynamicContext.set_base_uri(entryUrl.toString()); + if (useNewApi) { + if (staticContextBuilder.getBaseUri() == null) + try { + staticContextBuilder.withBaseUri(entryUrl.toString()); + } catch (URISyntaxException e) { + throw new RuntimeException(e); // drats + } + } else { + if (dynamicContext.base_uri().string_value() == null) + dynamicContext.set_base_uri(entryUrl.toString()); + } BufferedReader xqreader = new BufferedReader(new InputStreamReader( isxq, Charset.forName("UTF-8"))); int nByte = xqreader.read(cbuf); @@ -463,33 +594,42 @@ } protected void setupNamespace(String content) { - if (dynamicContext == null) return; // Can't set it up if nonexistent + if (!useNewApi && dynamicContext == null) return; // Can't set it up if nonexistent Pattern p = Pattern.compile(REGEX_DN); Matcher m = p.matcher(content); while (m.find()) { assertTrue(m.groupCount() == 2);// - dynamicContext.add_namespace(m.group(1), m.group(2)); + addNamespace(m.group(1), m.group(2)); } } protected DynamicContext setupVariables(DynamicContext dc) { - dc.add_variable(new QName("x")); - dc.add_variable(new QName("var")); + setVariable("x", (AnyType)null); + setVariable("var", (AnyType)null); if (domDoc != null) { - AnyType docType = new DocType(domDoc, dc.getTypeModel(domDoc)); - dc.set_variable(new QName("input-context1"), docType); - dc.set_variable(new QName("input-context"), docType); + TypeModel typeModel = dynamicContext != null ? dynamicContext.getTypeModel(domDoc) : staticContextBuilder.getTypeModel(); + AnyType docType = new DocType(domDoc, typeModel); + setVariable("input-context1", docType); + setVariable("input-context", docType); if (domDoc2 == null) { - dc.set_variable(new QName("input-context2"), docType); + setVariable("input-context2", docType); } else { - dc.set_variable(new QName("input-context2"), (AnyType) new DocType(domDoc2, dc.getTypeModel(domDoc2))); + setVariable("input-context2", (AnyType) new DocType(domDoc2, typeModel)); } } return dc; } + protected void setBaseUri(String uri) throws URISyntaxException { + if (useNewApi) { + staticContextBuilder.withBaseUri(uri); + } else { + dynamicContext.set_base_uri(uri); + } + } + protected String buildResultString(ResultSequence rs) { String actual = new String(); Iterator iterator = rs.iterator(); @@ -577,7 +717,7 @@ return; } - dc.add_namespace("myType", "http://www.w3.org/XQueryTest/userDefinedTypes"); + addNamespace("myType", "http://www.w3.org/XQueryTest/userDefinedTypes"); UserDefinedCtrLibrary udl = new UserDefinedCtrLibrary("http://www.w3.org/XQueryTest/userDefinedTypes"); for (int i = 0; i < xstypes.getLength(); i++) { @@ -607,7 +747,7 @@ } } - dc.add_function_library(udl); + addFunctionLibrary(udl); } @@ -632,10 +772,9 @@ throw new RuntimeException("Static error: " + e.getMessage(), e); } - Evaluator eval = new DefaultEvaluator(dc, doc); ResultSequence rs; try { - rs = eval.evaluate(path); + rs = evaluate(domDoc); } catch (DynamicError e) { throw new RuntimeException("Evaluation error: " + e.getMessage(), e); @@ -648,5 +787,9 @@ return result; } + protected StaticContext getStaticContext() { + return staticContextBuilder; + } + }
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/Bug269833.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/Bug269833.java index 427c902..9af9261 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/Bug269833.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/Bug269833.java
@@ -37,6 +37,7 @@ } protected void setUp() throws Exception { + super.setUp(); URL fileURL = new URL("http://resolve-locally/xml/note.xml"); loadDOMDocument(fileURL); } @@ -49,10 +50,9 @@ String xpath = "/note/to"; - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + String actual = rs.first().string_value();
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/KindTestSITest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/KindTestSITest.java index 5b99a83..0404114 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/KindTestSITest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/KindTestSITest.java
@@ -38,16 +38,15 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace(null, "http://typedecl"); + addNamespace(null, "http://typedecl"); // addUserDefinedSimpleTypes(schema, dc); String xpath = "/root/InterleaveType instance of element()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -73,16 +72,15 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace(null, "http://typedecl"); + addNamespace(null, "http://typedecl"); // addUserDefinedSimpleTypes(schema, dc); String xpath = "/root/InterleaveType instance of element(InterleaveType)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -108,16 +106,15 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace(null, "http://typedecl"); + addNamespace(null, "http://typedecl"); // addUserDefinedSimpleTypes(schema, dc); String xpath = "/root/InterleaveType instance of element(integer)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -146,14 +143,13 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace(null, "http://typedecl"); + addNamespace(null, "http://typedecl"); // addUserDefinedSimpleTypes(schema, dc); String xpath = "/root/InterleaveType instance of element(InterleaveType, InterleaveType)"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -176,14 +172,13 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace(null, "http://typedecl"); + addNamespace(null, "http://typedecl"); // addUserDefinedSimpleTypes(schema, dc); String xpath = "/root/InterleaveType instance of element(InterleaveType, InterleaveType2)"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first();
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestBugs.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestBugs.java index 435918d..abeb54d 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestBugs.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestBugs.java
@@ -56,6 +56,7 @@ * Mukul Gandhi - bug 338999 - improving compliance of function 'fn:subsequence'. implementing full arity support. * Mukul Gandhi - bug 339025 - fixes to fn:distinct-values function. ability to find distinct values on node items. * Mukul Gandhi - bug 341862 - improvements to computation of typed value of xs:boolean nodes. + * Jesper Steen Moller - bug 340933 - Migrate tests to new XPath2 API *******************************************************************************/ package org.eclipse.wst.xml.xpath2.processor.test; @@ -68,7 +69,7 @@ import org.apache.xerces.xs.XSModel; import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.xml.xpath2.processor.CollationProvider; +import org.eclipse.wst.xml.xpath2.api.CollationProvider; import org.eclipse.wst.xml.xpath2.processor.DefaultDynamicContext; import org.eclipse.wst.xml.xpath2.processor.DefaultEvaluator; import org.eclipse.wst.xml.xpath2.processor.DynamicContext; @@ -86,6 +87,7 @@ import org.eclipse.wst.xml.xpath2.processor.internal.types.XSFloat; import org.eclipse.wst.xml.xpath2.processor.internal.types.XSInteger; import org.eclipse.wst.xml.xpath2.processor.internal.types.XSString; +import org.eclipse.wst.xml.xpath2.processor.util.StaticContextBuilder; import org.osgi.framework.Bundle; import org.xml.sax.InputSource; @@ -116,10 +118,9 @@ // String xpath = "($input-context/atomic:root/atomic:integer) union ($input-context/atomic:root/atomic:integer)"; String xpath = "(/element/eq eq 'eq') or //child::xs:*"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -139,10 +140,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "string-length(x) > 2"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -163,10 +163,9 @@ // test with arity 2 String xpath = "substring(x, 3) = 'happy'"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -187,10 +186,9 @@ // test with arity 3 String xpath = "substring(x, 3, 4) = 'happ'"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -210,10 +208,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "x/string() = 'unhappy'"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -233,10 +230,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "x/string-length() = 7"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -256,10 +252,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "x/normalize-space() = 'unhappy'"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -280,10 +275,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "xs:anyURI('abc') eq xs:anyURI('abc')"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -313,11 +307,9 @@ // arity 0. // String xpath = // "note/base-uri() eq xs:anyURI('http://resolved-locally/xml/note.xml')"; + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -337,11 +329,9 @@ DynamicContext dc = setupDynamicContext(null); String xpath = "document-uri(/) eq xs:anyURI('http://resolved-locally/xml/note.xml')"; + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -366,10 +356,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "xs:boolean('1') eq xs:boolean('true')"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -389,10 +378,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "xs:date(x) eq xs:date('2009-01-01')"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -412,10 +400,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "xs:integer(x) gt 100"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -438,10 +425,9 @@ // long min value is -9223372036854775808 // and max value can be 9223372036854775807 String xpath = "xs:long('9223372036854775807') gt 0"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -464,10 +450,9 @@ // int min value is -2147483648 // and max value can be 2147483647 String xpath = "xs:int('2147483647') gt 0"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -489,10 +474,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "person/@dob eq xs:date('2006-12-10')"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -515,10 +499,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "person/dob eq xs:date('2006-12-10')"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -551,10 +534,9 @@ // I can't stand to see so much duplicated code!!! private boolean evaluateBoolean(DynamicContext dc, String xpath) throws Exception { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -576,10 +558,9 @@ // min value of xs:nonPositiveInteger is -INF // max value is 0 String xpath = "xs:nonPositiveInteger('0') eq 0"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -603,10 +584,9 @@ // min value of xs:negativeInteger is -INF // max value is -1 String xpath = "xs:negativeInteger('-1') eq -1"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -630,10 +610,9 @@ // min value of xs:short is -32768 // max value of xs:short is 32767 String xpath = "xs:short('-32768') eq -32768"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -657,10 +636,9 @@ // min value of xs:nonNegativeInteger is 0 // max value of xs:nonNegativeInteger is INF String xpath = "xs:nonNegativeInteger('0') eq 0"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -684,10 +662,9 @@ // min value of xs:unsignedLong is 0 // max value of xs:unsignedLong is 18446744073709551615 String xpath = "xs:unsignedLong('0') eq 0"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -711,10 +688,9 @@ // min value of xs:positiveInteger is 1 // max value of xs:positiveInteger is INF String xpath = "xs:positiveInteger('1') eq 1"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -738,10 +714,9 @@ // min value of xs:byte is -128 // max value of xs:byte is 127 String xpath = "xs:byte('-128') eq -128"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -765,10 +740,9 @@ // min value of xs:unsignedInt is 0 // max value of xs:unsignedInt is 4294967295 String xpath = "xs:unsignedInt('4294967295') eq xs:unsignedInt('4294967295')"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -791,10 +765,9 @@ // min value of xs:unsignedShort is 0 // max value of xs:unsignedShort is 65535 String xpath = "xs:unsignedShort('65535') eq 65535"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -815,10 +788,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "xs:yearMonthDuration('P2Y11M') * 2.3"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSDuration result = (XSDuration) rs.first(); @@ -839,10 +811,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "xs:yearMonthDuration('P2Y11M') div 1.5"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSDuration result = (XSDuration) rs.first(); @@ -863,10 +834,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "xs:yearMonthDuration('P3Y4M') div xs:yearMonthDuration('-P1Y4M')"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSDecimal result = (XSDecimal) rs.first(); @@ -887,10 +857,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "xs:dayTimeDuration('PT2H10M') * 2.1"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSDuration result = (XSDuration) rs.first(); @@ -911,10 +880,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "xs:dayTimeDuration('P1DT2H30M10.5S') div 1.5"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSDuration result = (XSDuration) rs.first(); @@ -935,10 +903,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "-(xs:double('0'))"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSDouble result = (XSDouble) rs.first(); @@ -959,10 +926,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "-(xs:float('0'))"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSFloat result = (XSFloat) rs.first(); @@ -985,10 +951,9 @@ // min value of xs:unsignedByte is 0 // max value of xs:unsignedByte is 255 String xpath = "xs:unsignedByte('255') eq 255"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1009,10 +974,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "xs:base64Binary('cmxjZ3R4c3JidnllcmVuZG91aWpsbXV5Z2NhamxpcmJkaWFhbmFob2VsYXVwZmJ1Z2dmanl2eHlzYmhheXFtZXR0anV2dG1q') eq xs:base64Binary('cmxjZ3R4c3JidnllcmVuZG91aWpsbXV5Z2NhamxpcmJkaWFhbmFob2VsYXVwZmJ1Z2dmanl2eHlzYmhheXFtZXR0anV2dG1q')"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1033,10 +997,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "xs:hexBinary('767479716c6a647663') eq xs:hexBinary('767479716c6a647663')"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1061,10 +1024,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/Transportation/mode eq 'air'"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1087,11 +1049,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "'\"\"'"; // the expression '""' contains no escapes + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); String resultValue = rs.first().string_value(); @@ -1110,11 +1070,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "concat( 'Don''t try this' , \" at \"\"home\"\",\" , ' she said' )"; + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); String resultValue = rs.first().string_value(); @@ -1124,20 +1082,19 @@ public void testBug280555_collations() throws Exception { // Setup context DefaultDynamicContext dc = setupDynamicContext(null); - dc.set_collation_provider(createLengthCollatorProvider()); - Evaluator eval = new DefaultEvaluator(dc, domDoc); + setCollationProvider(createLengthCollatorProvider()); // Parse expression - XPath path = compileXPath(dc, " 'abc' < 'de' "); + compileXPath(dc, " 'abc' < 'de' "); // Evaluate once - XSBoolean bval = (XSBoolean) eval.evaluate(path).first(); - assertTrue("'abc' < 'def' for normal collations", bval.value()); + XSBoolean bval = (XSBoolean) evaluate(domDoc).first(); + assertTrue("'abc' < 'de' for normal collations", bval.value()); // Evaluate again with the funny collator - dc.set_default_collation(URN_X_ECLIPSE_XPATH20_FUNKY_COLLATOR); - XSBoolean bval2 = (XSBoolean) eval.evaluate(path).first(); - assertFalse("'abc' < 'def' for normal collations", bval2.value()); + setDefaultCollation(URN_X_ECLIPSE_XPATH20_FUNKY_COLLATOR); + XSBoolean bval2 = (XSBoolean) evaluate(null).first(); + assertFalse("'abc' < 'de' should be false for the strange collations", bval2.value()); } public void testXPathDefaultNamespace() throws Exception { @@ -1154,10 +1111,9 @@ addXPathDefaultNamespace("http://xyz"); String xpath = "X/message = 'hello'"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1180,10 +1136,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/Transportation/mode instance of element()"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1191,7 +1146,20 @@ assertEquals("true", actual); } - + + public void testNestedABCs() throws Exception { + URL fileURL = bundle.getEntry("/bugTestFiles/nested-abc.xml"); + + loadDOMDocument(fileURL); + setupDynamicContext(null); + + String xpath = "a/b[2 > 1]/c[3 < 4]"; + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + + assertEquals(9, rs.size()); + } + public void testXPathInstanceOf2() throws Exception { // Bug 298267 URL fileURL = bundle.getEntry("/bugTestFiles/elementTypedValueBug.xml"); @@ -1206,10 +1174,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/Transportation/mode instance of element(mode)"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1232,10 +1199,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/Transportation/mode instance of element(mode, modeType)"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1258,10 +1224,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/Transportation/mode instance of element(mode, abc)"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1283,10 +1248,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/x instance of element(x, x_Type)*"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1308,10 +1272,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "(/Example/x, /Example) instance of element(x, x_Type)+"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1331,10 +1294,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "(/Example/x, /Example/x) instance of element(x, x_Type)"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1354,10 +1316,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "(/Example/x, /Example/x) instance of element(x, x_Type)+"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1397,10 +1358,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/x instance of element(*, x_Type)*"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1422,10 +1382,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/x instance of element(x, x_Type)+"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1447,10 +1406,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "/Example/x[1] instance of element(*, x_Type) and not (/Example/x[1] instance of element(*, y_Type))"; - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + XSBoolean result = (XSBoolean) rs.first(); @@ -1473,10 +1431,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/Transportation/mode instance of element(x)"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1498,10 +1455,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "number(Example/x) ge 18"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1522,10 +1478,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "number(xs:unsignedByte('20')) ge 18"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1547,10 +1502,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/x[1]/@mesg instance of attribute()"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1572,10 +1526,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/x[1]/@mesg instance of attribute(xx)"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1597,10 +1550,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/x[1]/@mesg instance of attribute(*, mesg_Type)"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1622,10 +1574,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/x[1]/@mesg instance of attribute(*, abc)"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1647,10 +1598,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/x[1]/@mesg instance of attribute(mesg, mesg_Type)"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1672,10 +1622,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/x[1]/@mesg instance of attribute(mesg, abc)"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1697,10 +1646,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/x/@mesg instance of attribute(mesg, mesg_Type)*"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1720,10 +1668,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "Example/*[1]/name() eq 'x'"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1744,13 +1691,11 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "xs:normalizedString('abcs\t') eq xs:normalizedString('abcs')"; - XPath path = compileXPath(dc, xpath); + compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - boolean testSuccess = false; try { - ResultSequence rs = eval.evaluate(path); + ResultSequence rs = evaluate(domDoc); } catch(DynamicError ex) { // a 'DynamicError' exception indicates, that this test is a success @@ -1772,7 +1717,7 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "/element/attribute"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); } public void testTypedValueEnhancement_primitiveTypes() throws Exception { @@ -1788,10 +1733,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "X gt 99"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1813,10 +1757,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "data(X) instance of xs:integer+"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1839,10 +1782,9 @@ // 1st test String xpath = "data(X) instance of xs:integer+"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); XSBoolean result = (XSBoolean) rs.first(); @@ -1863,17 +1805,17 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "data(X)"; - XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); - - boolean result1 = ((XSInteger) rs.get(0)).eq(new XSInteger(BigInteger. - valueOf(1)), dc); - boolean result2 = ((XSInteger) rs.get(1)).eq(new XSInteger(BigInteger. - valueOf(2)), dc); - boolean result3 = ((XSString) rs.get(2)).eq(new XSString("3.3"), dc); - - assertEquals(true, result1 && result2 && result3); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + + assertTrue(rs.get(0) instanceof XSInteger); + assertEquals(BigInteger.ONE, ((XSInteger) rs.get(0)).int_value()); + + assertTrue(rs.get(1) instanceof XSInteger); + assertEquals(BigInteger.valueOf(2), ((XSInteger) rs.get(1)).int_value()); + + assertTrue(rs.get(2) instanceof XSString); + assertEquals("3.3", ((XSString) rs.get(2)).string_value()); } public void testTypedValueEnhancement_Bug323900_4() throws Exception { @@ -1888,9 +1830,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "data(X)"; - XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + XSString result = (XSString) rs.get(0); assertEquals("3.3", result.string_value()); @@ -1908,9 +1850,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "data(X)"; - XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + XSInteger result = (XSInteger) rs.get(0); assertEquals("10", result.string_value()); @@ -1922,12 +1864,11 @@ DynamicContext dc = setupDynamicContext(null); ResultSequence rs = ResultSequenceFactory.create_new(); - dc.set_variable(new QName("value"), rs); + setVariable("value",rs); String xpath = "deep-equal($value,())"; - XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rsRes = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rsRes = evaluate(domDoc); XSBoolean result = (XSBoolean) rsRes.get(0); assertEquals("true", result.string_value()); @@ -1942,21 +1883,19 @@ rs.add(new XSInteger(BigInteger.valueOf(2))); rs.add(new XSInteger(BigInteger.valueOf(4))); rs.add(new XSInteger(BigInteger.valueOf(6))); - dc.set_variable(new QName("value"), rs); + setVariable("value",rs); // test a String xpath = "$value instance of xs:integer+"; - XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rsRes = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rsRes = evaluate(domDoc); XSBoolean result = (XSBoolean) rsRes.get(0); assertEquals("true", result.string_value()); // test b xpath = "deep-equal($value, (2, 4, 6))"; - path = compileXPath(dc, xpath); - eval = new DefaultEvaluator(dc, domDoc); - rsRes = eval.evaluate(path); + compileXPath(dc, xpath); + rsRes = evaluate(domDoc); result = (XSBoolean) rsRes.get(0); assertEquals("true", result.string_value()); } @@ -1970,12 +1909,11 @@ rs.add(new XSInteger(BigInteger.valueOf(2))); rs.add(new XSInteger(BigInteger.valueOf(4))); rs.add(new XSInteger(BigInteger.valueOf(6))); - dc.set_variable(new QName("value"), rs); + setVariable("value",rs); String xpath = "count(data($value)) = 3"; - XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rsRes = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rsRes = evaluate(domDoc); XSBoolean result = (XSBoolean) rsRes.get(0); assertEquals("true", result.string_value()); } @@ -1993,13 +1931,11 @@ // the strings in below are not valid tokens (they contain 2 consecutive spaces) String xpath = "xs:token('abcs abcde') eq xs:token('abcs abcde')"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - boolean testSuccess = false; try { - ResultSequence rs = eval.evaluate(path); + ResultSequence rs = evaluate(domDoc); } catch(DynamicError ex) { // a 'DynamicError' exception indicates, that this test is a success @@ -2022,17 +1958,16 @@ // test a) String xpath = "xs:Name('x:abc') eq xs:Name('x:abc')"; - XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rsRes = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rsRes = evaluate(domDoc); XSBoolean result = (XSBoolean) rsRes.get(0); assertEquals("true", result.string_value()); // test b) xpath = "xs:NCName('x:abc') eq xs:NCName('x:abc')"; - path = compileXPath(dc, xpath); + compileXPath(dc, xpath); try { - rsRes = eval.evaluate(path); + rsRes = evaluate(domDoc); assertTrue(false); } catch(DynamicError ex) { @@ -2042,16 +1977,16 @@ // test c) xpath = "xs:NCName('abc') eq xs:NCName('abc')"; - path = compileXPath(dc, xpath); - rsRes = eval.evaluate(path); + compileXPath(dc, xpath); + rsRes = evaluate(domDoc); result = (XSBoolean) rsRes.get(0); assertEquals("true", result.string_value()); // test d) xpath = "xs:ID('x:abc') eq xs:ID('x:abc')"; - path = compileXPath(dc, xpath); + compileXPath(dc, xpath); try { - rsRes = eval.evaluate(path); + rsRes = evaluate(domDoc); assertTrue(false); } catch(DynamicError ex) { @@ -2061,8 +1996,8 @@ // test e) xpath = "xs:ID('abc') eq xs:ID('abc')"; - path = compileXPath(dc, xpath); - rsRes = eval.evaluate(path); + compileXPath(dc, xpath); + rsRes = evaluate(domDoc); result = (XSBoolean) rsRes.get(0); assertEquals("true", result.string_value()); } @@ -2077,14 +2012,12 @@ // set up XPath default namespace in Dynamic Context DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("value"), new XSString("2.5")); + setVariable("value",new XSString("2.5")); addXPathDefaultNamespace("http://www.w3.org/2001/XMLSchema"); String xpath = "$value castable as double"; - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, null); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(null); XSBoolean result = (XSBoolean) rs.first(); @@ -2186,42 +2119,40 @@ DynamicContext dc = setupDynamicContext(schema); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - // test a) String xpath = "count(subsequence(X/*, 2)) eq 2"; - XPath path = compileXPath(dc, xpath); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); String actual = ((XSBoolean) rs.first()).string_value(); assertEquals("true", actual); // test b) xpath = "subsequence(X/*, 2) instance of element(*, xs:integer)+"; - path = compileXPath(dc, xpath); - rs = eval.evaluate(path); + compileXPath(dc, xpath); + rs = evaluate(domDoc); actual = ((XSBoolean) rs.first()).string_value(); assertEquals("true", actual); // test c) xpath = "deep-equal(subsequence((1,2,3,4), 2), (2,3,4))"; - path = compileXPath(dc, xpath); - rs = eval.evaluate(path); + compileXPath(dc, xpath); + rs = evaluate(domDoc); actual = ((XSBoolean) rs.first()).string_value(); assertEquals("true", actual); // test d) // hetrogeneous sequence as input. arity 3 mode. xpath = "deep-equal(subsequence(('a', 1, 1.5), 2, 2), (1, 1.5))"; - path = compileXPath(dc, xpath); - rs = eval.evaluate(path); + compileXPath(dc, xpath); + rs = evaluate(domDoc); actual = ((XSBoolean) rs.first()).string_value(); assertEquals("true", actual); // test e) // hetrogeneous sequence as input. arity 3 mode (startingLoc is < 0). xpath = "deep-equal(subsequence(('a', 1, 1.5, 'b'), -2, 3), ())"; - path = compileXPath(dc, xpath); - rs = eval.evaluate(path); + compileXPath(dc, xpath); + rs = evaluate(domDoc); actual = ((XSBoolean) rs.first()).string_value(); assertEquals("true", actual); } @@ -2237,26 +2168,25 @@ XSModel schema = getGrammar(schemaURL); DynamicContext dc = setupDynamicContext(schema);; - Evaluator eval = new DefaultEvaluator(dc, domDoc); // test a) String xpath = "count(//a) = count(distinct-values(//a))"; - XPath path = compileXPath(dc, xpath); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); String actual = ((XSBoolean) rs.first()).string_value(); assertEquals("true", actual); // test b) xpath = "count(X/a) = count(distinct-values(X/a))"; - path = compileXPath(dc, xpath); - rs = eval.evaluate(path); + compileXPath(dc, xpath); + rs = evaluate(domDoc); actual = ((XSBoolean) rs.first()).string_value(); assertEquals("true", actual); // test c) xpath = "count(//b) = count(distinct-values(//b))"; - path = compileXPath(dc, xpath); - rs = eval.evaluate(path); + compileXPath(dc, xpath); + rs = evaluate(domDoc); actual = ((XSBoolean) rs.first()).string_value(); assertEquals("false", actual); } @@ -2332,8 +2262,10 @@ } private CollationProvider createLengthCollatorProvider() { + final CollationProvider oldProvider = getStaticContext().getCollationProvider(); return new CollationProvider() { - public Comparator get_collation(String name) { + + public Comparator getCollation(String name) { if (name.equals(URN_X_ECLIPSE_XPATH20_FUNKY_COLLATOR)) { return new Comparator() { public int compare(Object o1, Object o2) { @@ -2341,7 +2273,11 @@ } }; } - return null; + return oldProvider.getCollation(name); + } + + public String getDefaultCollation() { + return oldProvider.getDefaultCollation(); } }; }
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestMinMax.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestMinMax.java index 135db98..b752fb0 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestMinMax.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestMinMax.java
@@ -13,7 +13,7 @@ import java.util.Comparator; -import org.eclipse.wst.xml.xpath2.processor.CollationProvider; +import org.eclipse.wst.xml.xpath2.api.CollationProvider; import org.eclipse.wst.xml.xpath2.processor.DefaultDynamicContext; import org.eclipse.wst.xml.xpath2.processor.DefaultEvaluator; import org.eclipse.wst.xml.xpath2.processor.DynamicContext; @@ -61,11 +61,9 @@ private void assertXPathEvalation(String xpath, String expectedResult) throws XPathParserException, StaticError, DynamicError { DynamicContext dc = setupDynamicContext(null); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); String resultValue = buildResultString(rs); @@ -74,13 +72,12 @@ private void assertDynamicError(String xpath, String errorCode) throws XPathParserException, StaticError { - DynamicContext dc = setupDynamicContext(null); + setupDynamicContext(null); - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); try { - Evaluator eval = new DefaultEvaluator(dc, domDoc); - eval.evaluate(path); + evaluate(domDoc); fail("Error " + errorCode + " expected here"); } catch (DynamicError de) { assertEquals("Wrong error code", errorCode, de.code()); @@ -91,22 +88,20 @@ public void testStringMax() throws Exception { DefaultDynamicContext dc = setupDynamicContext(null); - dc.set_collation_provider(createLengthCollatorProvider()); + setCollationProvider(createLengthCollatorProvider()); String xpath = "max( ('1000', '200', '30', '4') )"; + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); String resultValue = rs.first().string_value(); // lexicographically, '4' is biggest assertEquals("4", resultValue); - dc.set_default_collation(URN_X_ECLIPSE_XPATH20_FUNKY_COLLATOR); + setDefaultCollation(URN_X_ECLIPSE_XPATH20_FUNKY_COLLATOR); - rs = eval.evaluate(path); + rs = evaluate(null); resultValue = rs.first().string_value(); // length-wise, '1000' is biggest! @@ -114,8 +109,10 @@ } private CollationProvider createLengthCollatorProvider() { + final CollationProvider oldProvider = getStaticContext().getCollationProvider(); return new CollationProvider() { - public Comparator get_collation(String name) { + + public Comparator getCollation(String name) { if (name.equals(URN_X_ECLIPSE_XPATH20_FUNKY_COLLATOR)) { return new Comparator() { public int compare(Object o1, Object o2) { @@ -123,10 +120,13 @@ } }; } - return null; + return oldProvider.getCollation(name); + } + + public String getDefaultCollation() { + return oldProvider.getDefaultCollation(); } }; } - }
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestSumAvg.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestSumAvg.java index 571e975..995847c 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestSumAvg.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestSumAvg.java
@@ -55,11 +55,9 @@ private void assertXPathEvalation(String xpath, String expectedResult) throws XPathParserException, StaticError, DynamicError { DynamicContext dc = setupDynamicContext(null); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); String resultValue = buildResultString(rs); @@ -68,13 +66,12 @@ private void assertDynamicError(String xpath, String errorCode) throws XPathParserException, StaticError { - DynamicContext dc = setupDynamicContext(null); + setupDynamicContext(null); - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); try { - Evaluator eval = new DefaultEvaluator(dc, domDoc); - eval.evaluate(path); + evaluate(null); fail("Error " + errorCode + " expected here"); } catch (DynamicError de) { assertEquals("Wrong error code", errorCode, de.code());
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestXPath20.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestXPath20.java index cbf469d..766b5fd 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestXPath20.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestXPath20.java
@@ -77,11 +77,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "/employees/employee[1]/location"; + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); ElementType result = (ElementType) rs.first(); String resultValue = result.node_value().getTextContent(); @@ -96,11 +94,9 @@ DynamicContext dc = setupDynamicContext(schema); String xpath = "$input-context/employees/employee[1]/location"; + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); ElementType result = (ElementType) rs.first(); String resultValue = result.node_value().getTextContent();
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/newapi/CompleteNewApiTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/newapi/CompleteNewApiTest.java index b5b5622..a0a9bf2 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/newapi/CompleteNewApiTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/newapi/CompleteNewApiTest.java
@@ -1,3 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2011 Jesper Steen Moller + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Jesper Steen Moller - initial API and implementation + *******************************************************************************/ + package org.eclipse.wst.xml.xpath2.processor.test.newapi; import java.io.IOException; @@ -135,8 +146,11 @@ assertEquals(Boolean.TRUE, b); } - public void xtestNamesWhichAreKeywords() throws Exception { + public void testNamesWhichAreKeywords() throws Exception { // Bug 273719 + bundle = Platform + .getBundle("org.eclipse.wst.xml.xpath2.processor.tests"); + URL fileURL = bundle.getEntry("/bugTestFiles/bug311480.xml"); loadDOMDocument(fileURL); @@ -144,11 +158,11 @@ XSModel schema = getGrammar(); // String xpath = "($input-context/atomic:root/atomic:integer) union ($input-context/atomic:root/atomic:integer)"; - String xpath = "(/element/eq eq 'eq') or //child::xs:*"; + String xpath = "((/element/eq eq 'eq') or //child::xs:*) and false"; - Boolean b = (Boolean)evaluateSimpleXPath(xpath, new StaticContextBuilder().withTypeModel(new XercesTypeModel(schema)), domDoc, Boolean.class); + Boolean b = (Boolean)evaluateSimpleXPath(xpath, new StaticContextBuilder().withNamespace("xs", "urn:joe").withTypeModel(new XercesTypeModel(schema)), domDoc, Boolean.class); - assertEquals(Boolean.TRUE, b); + assertEquals(Boolean.FALSE, b); }
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/AbbrAxesTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/AbbrAxesTest.java index e91b5e1..d511270 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/AbbrAxesTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/AbbrAxesTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -150,10 +147,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -187,10 +183,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -224,10 +219,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -261,10 +255,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -298,10 +291,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -335,10 +327,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -372,10 +363,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -409,10 +399,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -446,10 +435,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -483,10 +471,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -520,10 +507,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -557,10 +543,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -594,10 +579,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -631,10 +615,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -668,10 +651,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -705,10 +687,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -742,10 +723,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -779,10 +759,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/AxesTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/AxesTest.java index 81c254f..6f1f8f1 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/AxesTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/AxesTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1406,10 +1369,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1443,10 +1405,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1480,10 +1441,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1517,10 +1477,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1554,10 +1513,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1591,10 +1549,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1628,10 +1585,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1665,10 +1621,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1702,10 +1657,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1739,10 +1693,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1776,10 +1729,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1813,10 +1765,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1850,10 +1801,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1887,10 +1837,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1924,10 +1873,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1961,10 +1909,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1998,10 +1945,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2035,10 +1981,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2072,10 +2017,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2109,10 +2053,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2146,10 +2089,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2183,10 +2125,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2220,10 +2161,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2257,10 +2197,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2294,10 +2233,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2331,10 +2269,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2368,10 +2305,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2405,10 +2341,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2442,10 +2377,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2479,10 +2413,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2516,10 +2449,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2553,10 +2485,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2590,10 +2521,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2627,10 +2557,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2664,10 +2593,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2701,10 +2629,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2738,10 +2665,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2775,10 +2701,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2812,10 +2737,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2849,10 +2773,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2886,10 +2809,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2923,10 +2845,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2960,10 +2881,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2997,10 +2917,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3034,10 +2953,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3071,10 +2989,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3108,10 +3025,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3145,10 +3061,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3182,10 +3097,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3219,10 +3133,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3256,10 +3169,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3293,10 +3205,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3330,10 +3241,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3367,10 +3277,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3404,10 +3313,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3441,10 +3349,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3478,10 +3385,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3515,10 +3421,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3552,10 +3457,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3589,10 +3493,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3626,10 +3529,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3663,10 +3565,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3700,10 +3601,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3737,10 +3637,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3774,10 +3673,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3811,10 +3709,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3848,10 +3745,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3885,10 +3781,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3922,10 +3817,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3959,10 +3853,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3996,10 +3889,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4033,10 +3925,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4070,10 +3961,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4107,10 +3997,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4144,10 +4033,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4181,10 +4069,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4218,10 +4105,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4255,10 +4141,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4292,10 +4177,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4329,10 +4213,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4366,10 +4249,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4403,10 +4285,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4440,10 +4321,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4477,10 +4357,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4514,10 +4393,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4551,10 +4429,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4588,10 +4465,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4625,10 +4501,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4662,10 +4537,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4699,10 +4573,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4736,10 +4609,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4773,10 +4645,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4810,10 +4681,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4847,10 +4717,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4884,10 +4753,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4921,10 +4789,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4958,10 +4825,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4995,10 +4861,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5032,10 +4897,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5069,10 +4933,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5106,10 +4969,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5143,10 +5005,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5180,10 +5041,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5217,10 +5077,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5254,10 +5113,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5291,10 +5149,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5328,10 +5185,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5365,10 +5221,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5402,10 +5257,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5439,10 +5293,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5476,10 +5329,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5513,10 +5365,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5550,10 +5401,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5587,10 +5437,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5624,10 +5473,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5661,10 +5509,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5698,10 +5545,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5735,10 +5581,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5772,10 +5617,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5809,10 +5653,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5846,10 +5689,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5883,10 +5725,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5920,10 +5761,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5957,10 +5797,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5994,10 +5833,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6031,10 +5869,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6068,10 +5905,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6105,10 +5941,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6142,10 +5977,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6179,10 +6013,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6216,10 +6049,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6253,10 +6085,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6290,10 +6121,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6327,10 +6157,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6364,10 +6193,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6401,10 +6229,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6438,10 +6265,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6475,10 +6301,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6512,10 +6337,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6549,10 +6373,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6586,10 +6409,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6623,10 +6445,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6660,10 +6481,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6697,10 +6517,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6845,10 +6664,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6883,10 +6701,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/Base64BinaryEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/Base64BinaryEQTest.java index 0e6122d..19badb4 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/Base64BinaryEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/Base64BinaryEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/BooleanEqualTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/BooleanEqualTest.java index 50ead7a..8341397 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/BooleanEqualTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/BooleanEqualTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -817,10 +796,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -854,10 +832,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -891,10 +868,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -928,10 +904,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -965,10 +940,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1002,10 +976,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1039,10 +1012,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1076,10 +1048,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1113,10 +1084,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1150,10 +1120,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1187,10 +1156,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1224,10 +1192,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1261,10 +1228,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1298,10 +1264,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1335,10 +1300,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1372,10 +1336,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1409,10 +1372,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1446,10 +1408,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1483,10 +1444,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1520,10 +1480,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/BooleanGTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/BooleanGTTest.java index 900df32..190c0eb 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/BooleanGTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/BooleanGTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/BooleanLTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/BooleanLTTest.java index faadbc5..0ab42d8 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/BooleanLTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/BooleanLTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/CombNodeSeqTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/CombNodeSeqTest.java index 4f1cd78..dae2cea 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/CombNodeSeqTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/CombNodeSeqTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/CondExprTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/CondExprTest.java index 45af6ad..5f0b21f 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/CondExprTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/CondExprTest.java
@@ -39,10 +39,9 @@ String xpath = extractXPathExpression(xqFile, inputFile, "out"); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -76,10 +75,9 @@ String xpath = extractXPathExpression(xqFile, inputFile, "out"); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -113,10 +111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile, "out"); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -150,10 +147,9 @@ String xpath = extractXPathExpression(xqFile, inputFile, "out"); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -189,10 +185,9 @@ String xpath = extractXPathExpression(xqFile, inputFile, "out"); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -226,10 +221,9 @@ String xpath = extractXPathExpression(xqFile, inputFile, "out"); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -263,10 +257,9 @@ String xpath = extractXPathExpression(xqFile, inputFile, "out"); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -300,10 +293,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -338,10 +330,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -375,10 +366,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -411,10 +401,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -448,10 +437,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -485,10 +473,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/DurationEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/DurationEQTest.java index 4bf38c6..718bf7c 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/DurationEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/DurationEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2036,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2073,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2110,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2147,10 +2090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2184,10 +2126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2221,10 +2162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2258,10 +2198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2295,10 +2234,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2332,10 +2270,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2369,10 +2306,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2406,10 +2342,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2443,10 +2378,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2480,10 +2414,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2517,10 +2450,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2554,10 +2486,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ExternalContextExprTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ExternalContextExprTest.java index cb91699..a2ad22a 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ExternalContextExprTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ExternalContextExprTest.java
@@ -39,10 +39,8 @@ String xpath = "name"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, null); // no context node - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(null); // no context node AnyType result = rs.first(); @@ -78,10 +76,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -116,10 +113,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -154,10 +150,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -192,10 +187,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -230,10 +224,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -268,10 +261,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -306,10 +298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -344,10 +335,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -383,10 +373,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -421,10 +410,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -459,10 +447,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -497,10 +484,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -535,10 +521,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -573,10 +558,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -611,10 +595,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -649,10 +632,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -687,10 +669,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -725,10 +706,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -763,10 +743,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -801,10 +780,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -839,10 +817,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); } catch (XPathParserException ex) { @@ -874,10 +851,8 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, null); // no context - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(null); // no context node AnyType result = rs.first(); actual = result.string_value(); @@ -911,10 +886,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); } catch (XPathParserException ex) {
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/FilterExprTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/FilterExprTest.java index 9c89713..f8a515d 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/FilterExprTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/FilterExprTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ForExprWithTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ForExprWithTest.java index 37d9bec..1e58b01 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ForExprWithTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ForExprWithTest.java
@@ -37,10 +37,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -73,10 +72,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -109,10 +107,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -145,10 +142,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ForExprWithoutTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ForExprWithoutTest.java index 76da243..057a237 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ForExprWithoutTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ForExprWithoutTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -148,10 +145,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -185,10 +181,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -222,10 +217,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -258,10 +252,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -295,10 +288,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -332,10 +324,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -368,10 +359,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -404,10 +394,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -440,10 +429,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -476,10 +464,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -513,10 +500,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -550,10 +536,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -586,10 +571,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -622,10 +606,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompEqTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompEqTest.java index d0d07cb..944e144 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompEqTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompEqTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompGTEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompGTEQTest.java index 18da11f..e91aadd 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompGTEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompGTEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompGTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompGTTest.java index 34399a9..8040516 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompGTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompGTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompLTEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompLTEQTest.java index 410f3e7..01b29cb 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompLTEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompLTEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompLTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompLTTest.java index 3e6b361..0e165a1 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompLTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompLTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompNETest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompNETest.java index d2be9c1..6c72721 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompNETest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/GenCompNETest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -446,10 +435,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -483,10 +471,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -520,10 +507,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -557,10 +543,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -594,10 +579,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -631,10 +615,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -668,10 +651,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -705,10 +687,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -742,10 +723,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -779,10 +759,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -816,10 +795,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -853,10 +831,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -890,10 +867,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -927,10 +903,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -964,10 +939,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1001,10 +975,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1038,10 +1011,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1075,10 +1047,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1112,10 +1083,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1149,10 +1119,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1186,10 +1155,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1223,10 +1191,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1261,10 +1228,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1298,10 +1264,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1335,10 +1300,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1372,10 +1336,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1409,10 +1372,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1446,10 +1408,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1483,10 +1444,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1520,10 +1480,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1557,10 +1516,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1594,10 +1552,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1631,10 +1588,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1668,10 +1624,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1705,10 +1660,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1742,10 +1696,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1779,10 +1732,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/HexBinaryEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/HexBinaryEQTest.java index e03b494..509d93a 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/HexBinaryEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/HexBinaryEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/InternalContextExprTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/InternalContextExprTest.java index f7f2200..7f33536 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/InternalContextExprTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/InternalContextExprTest.java
@@ -33,7 +33,7 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("eg", "http://example.org"); + addNamespace("eg", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); // Override, since we don't have XQuery syntax @@ -42,9 +42,8 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // NO CONTEXT! - ResultSequence rs = eval.evaluate(path); - + ResultSequence rs = evaluate(null); // NO CONTEXT! + actual = buildResultString(rs); } catch (XPathParserException ex) { @@ -77,10 +76,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -114,10 +112,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -151,10 +148,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -188,10 +184,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -225,10 +220,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -262,10 +256,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -299,10 +292,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -336,10 +328,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -373,10 +364,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -410,10 +400,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -447,10 +436,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -484,10 +472,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -521,10 +508,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -558,10 +544,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -595,10 +580,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -632,10 +616,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -669,10 +652,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -706,10 +688,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -743,10 +724,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -780,10 +760,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/LiteralsTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/LiteralsTest.java index c081e85..267eb12 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/LiteralsTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/LiteralsTest.java
@@ -46,10 +46,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -82,10 +81,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -118,10 +116,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -154,10 +151,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -190,10 +186,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -225,10 +220,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -295,10 +288,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -331,10 +323,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -367,10 +358,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -403,10 +393,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -439,10 +428,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -475,10 +463,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -511,10 +498,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -547,10 +533,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -583,10 +568,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -619,10 +603,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -655,10 +638,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -691,10 +673,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -727,10 +708,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -763,10 +743,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -799,10 +778,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -835,10 +813,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -871,10 +848,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -907,10 +883,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -943,10 +918,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -979,10 +953,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1015,10 +988,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1051,10 +1023,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1087,10 +1058,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1123,10 +1093,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1159,10 +1128,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1195,10 +1163,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1231,10 +1198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1266,10 +1232,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1301,10 +1266,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1336,10 +1300,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1371,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1406,10 +1368,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1441,10 +1402,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1476,10 +1436,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1511,10 +1470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1546,10 +1504,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1581,10 +1538,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1616,10 +1572,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1651,10 +1606,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1686,10 +1640,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1721,10 +1674,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1756,10 +1708,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1791,10 +1742,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1826,10 +1776,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1861,10 +1810,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1896,10 +1844,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1931,10 +1878,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -1967,10 +1913,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -2003,10 +1948,9 @@ String xpath = extractXPathExpressionNoEscape(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -2039,10 +1983,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -2075,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -2111,10 +2053,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -2147,10 +2088,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -2183,10 +2123,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -2219,10 +2158,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -2255,10 +2193,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -2291,10 +2228,9 @@ String xpath = "'He said, \"I don''t like it.\"'"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -2327,10 +2263,9 @@ String xpath = "\"He said, \"\"I don't like it.\"\"\""; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first();
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/LogicExprTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/LogicExprTest.java index 47eb73a..2636cb1 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/LogicExprTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/LogicExprTest.java
@@ -38,10 +38,9 @@ String xpath = "false() and false()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -75,10 +74,9 @@ String xpath = "true() and false()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -112,10 +110,9 @@ String xpath = "false() and true()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -149,10 +146,9 @@ String xpath = "true() and true()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -186,10 +182,9 @@ String xpath = "() and ()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -223,10 +218,9 @@ String xpath = "(1) and ()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -260,10 +254,9 @@ String xpath = "() and (1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -297,10 +290,9 @@ String xpath = "(1) and (1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -334,10 +326,9 @@ String xpath = "(0) and ()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -371,10 +362,9 @@ String xpath = "() and (0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -408,10 +398,9 @@ String xpath = "(0) and (0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -445,10 +434,9 @@ String xpath = "(1) and (0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -482,10 +470,9 @@ String xpath = "(0) and (1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -519,10 +506,9 @@ String xpath = "(0) and ($input-context/bib/book/price/text())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -556,10 +542,9 @@ String xpath = "($input-context/bib/book/price/text()) and (1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -593,10 +578,9 @@ String xpath = "($input-context/bib/book/price/text()) and ($input-context/bib/book/price/text())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -630,10 +614,9 @@ String xpath = "\"\" and ''"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -667,10 +650,9 @@ String xpath = "\"\" and 'a'"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -704,10 +686,9 @@ String xpath = "\"0\" and ''"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -741,10 +722,9 @@ String xpath = "\"a\" and '0'"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -778,10 +758,9 @@ String xpath = "xs:string(\"\") and xs:string('')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -815,10 +794,9 @@ String xpath = "xs:string(\"\") and xs:string('abc')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -852,10 +830,9 @@ String xpath = "xs:string(\"abc\") and xs:string('')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -889,10 +866,9 @@ String xpath = "xs:string(\"0\") and xs:string('abc')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -926,10 +902,9 @@ String xpath = "xs:untypedAtomic('') and xs:untypedAtomic(\"\")"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -963,10 +938,9 @@ String xpath = "xs:untypedAtomic('abc') and xs:untypedAtomic(\"\")"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1000,10 +974,9 @@ String xpath = "xs:untypedAtomic('') and xs:untypedAtomic(\"0\")"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1037,10 +1010,9 @@ String xpath = "xs:untypedAtomic('abc') and xs:untypedAtomic(\"0\")"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1074,10 +1046,9 @@ String xpath = "0 and 0"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1111,10 +1082,9 @@ String xpath = "0 and 1"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1148,10 +1118,9 @@ String xpath = "1 and 0"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1185,10 +1154,9 @@ String xpath = "0 and -1"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1222,10 +1190,9 @@ String xpath = "-1 and 1"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1259,10 +1226,9 @@ String xpath = "xs:float(0) and xs:float(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1296,10 +1262,9 @@ String xpath = "xs:float(0) and xs:float(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1333,10 +1298,9 @@ String xpath = "xs:float(-1) and xs:float(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1370,10 +1334,9 @@ String xpath = "xs:float(1) and xs:float(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1407,10 +1370,9 @@ String xpath = "xs:float('NaN') and xs:float(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1444,10 +1406,9 @@ String xpath = "xs:float('NaN') and xs:float(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1481,10 +1442,9 @@ String xpath = "xs:float('NaN') and xs:float('NaN')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1518,10 +1478,9 @@ String xpath = "xs:float('INF') and xs:float(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1555,10 +1514,9 @@ String xpath = "xs:float('INF') and xs:float(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1592,10 +1550,9 @@ String xpath = "xs:float('INF') and xs:float('NaN')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1629,10 +1586,9 @@ String xpath = "xs:float('-INF') and xs:float(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1666,10 +1622,9 @@ String xpath = "xs:float('-INF') and xs:float(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1703,10 +1658,9 @@ String xpath = "xs:float('-INF') and xs:float('NaN')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1740,10 +1694,9 @@ String xpath = "xs:float('-INF') and xs:float('INF')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1777,10 +1730,9 @@ String xpath = "xs:double(0) and xs:double(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1814,10 +1766,9 @@ String xpath = "xs:double(0) and xs:double(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1851,10 +1802,9 @@ String xpath = "xs:double(-1) and xs:double(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1888,10 +1838,9 @@ String xpath = "xs:double(1) and xs:double(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1925,10 +1874,9 @@ String xpath = "xs:double('NaN') and xs:double(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1962,10 +1910,9 @@ String xpath = "xs:double('NaN') and xs:double(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1999,10 +1946,9 @@ String xpath = "xs:double('NaN') and xs:double('NaN')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2036,10 +1982,9 @@ String xpath = "xs:double('INF') and xs:double(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2073,10 +2018,9 @@ String xpath = "xs:double('INF') and xs:double(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2110,10 +2054,9 @@ String xpath = "xs:double('INF') and xs:double('NaN')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2147,10 +2090,9 @@ String xpath = "xs:double('-INF') and xs:double(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2184,10 +2126,9 @@ String xpath = "xs:double('-INF') and xs:double(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2221,10 +2162,9 @@ String xpath = "xs:double('-INF') and xs:double('NaN')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2258,10 +2198,9 @@ String xpath = "xs:double('-INF') and xs:double('INF')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2295,10 +2234,9 @@ String xpath = "xs:decimal(0) and xs:decimal(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2332,10 +2270,9 @@ String xpath = "xs:decimal(0) and xs:decimal(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2369,10 +2306,9 @@ String xpath = "xs:decimal(-1) and xs:decimal(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2406,10 +2342,9 @@ String xpath = "xs:decimal(1) and xs:decimal(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2443,10 +2378,9 @@ String xpath = "xs:decimal(9.99999999999999999999999999) and xs:decimal(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2480,10 +2414,9 @@ String xpath = "xs:decimal(-123456789.123456789123456789) and xs:decimal(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2517,10 +2450,9 @@ String xpath = "xs:decimal(9.99999999999999999999999999) and xs:decimal(-123456789.123456789123456789)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2554,10 +2486,9 @@ String xpath = "xs:integer(0) and xs:integer(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2591,10 +2522,9 @@ String xpath = "xs:integer(0) and xs:integer(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2628,10 +2558,9 @@ String xpath = "xs:integer(-1) and xs:integer(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2665,10 +2594,9 @@ String xpath = "xs:integer(1) and xs:integer(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2702,10 +2630,9 @@ String xpath = "xs:integer(99999999999999999) and xs:integer(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2739,10 +2666,9 @@ String xpath = "xs:integer(-99999999999999999) and xs:integer(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2776,10 +2702,9 @@ String xpath = "xs:integer(99999999999999999) and xs:integer(-99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2813,10 +2738,9 @@ String xpath = "xs:nonPositiveInteger(0) and xs:nonPositiveInteger(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2850,10 +2774,9 @@ String xpath = "xs:nonPositiveInteger(0) and xs:nonPositiveInteger(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2887,10 +2810,9 @@ String xpath = "xs:nonPositiveInteger(-1) and xs:nonPositiveInteger(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2924,10 +2846,9 @@ String xpath = "xs:nonPositiveInteger(-1) and xs:nonPositiveInteger(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2961,10 +2882,9 @@ String xpath = "xs:nonPositiveInteger(-99999999999999999) and xs:nonPositiveInteger(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2998,10 +2918,9 @@ String xpath = "xs:nonPositiveInteger(-1) and xs:nonPositiveInteger(-9999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3035,10 +2954,9 @@ String xpath = "xs:nonPositiveInteger(-99999999999999999) and xs:nonPositiveInteger(-99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3072,10 +2990,9 @@ String xpath = "xs:nonNegativeInteger(0) and xs:nonNegativeInteger(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3109,10 +3026,9 @@ String xpath = "xs:nonNegativeInteger(0) and xs:nonNegativeInteger(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3146,10 +3062,9 @@ String xpath = "xs:nonNegativeInteger(1) and xs:nonNegativeInteger(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3183,10 +3098,9 @@ String xpath = "xs:nonNegativeInteger(1) and xs:nonNegativeInteger(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3220,10 +3134,9 @@ String xpath = "xs:nonNegativeInteger(9999999999) and xs:nonNegativeInteger(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3257,10 +3170,9 @@ String xpath = "xs:nonNegativeInteger(1) and xs:nonNegativeInteger(99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3294,10 +3206,9 @@ String xpath = "xs:nonNegativeInteger(99999999999999999) and xs:nonNegativeInteger(99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3331,10 +3242,9 @@ String xpath = "xs:negativeInteger(-1) and xs:negativeInteger(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3368,10 +3278,9 @@ String xpath = "xs:negativeInteger(-99999999999999999) and xs:negativeInteger(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3405,10 +3314,9 @@ String xpath = "xs:negativeInteger(-99999999999999999) and xs:negativeInteger(-99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3442,10 +3350,9 @@ String xpath = "xs:positiveInteger(1) and xs:positiveInteger(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3479,10 +3386,9 @@ String xpath = "xs:positiveInteger(99999999999999999) and xs:positiveInteger(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3516,10 +3422,9 @@ String xpath = "xs:positiveInteger(99999999999999999) and xs:positiveInteger(99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3553,10 +3458,9 @@ String xpath = "xs:long(0) and xs:long(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3590,10 +3494,9 @@ String xpath = "xs:long(0) and xs:long(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3627,10 +3530,9 @@ String xpath = "xs:long(-1) and xs:long(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3664,10 +3566,9 @@ String xpath = "xs:long(1) and xs:long(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3701,10 +3602,9 @@ String xpath = "xs:long(9223372036854775807) and xs:long(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3738,10 +3638,9 @@ String xpath = "xs:long(9223372036854775807) and xs:long(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3775,10 +3674,9 @@ String xpath = "xs:long(-99999999999999999) and xs:long(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3812,10 +3710,9 @@ String xpath = "xs:long(-99999999999999999) and xs:long(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3849,10 +3746,9 @@ String xpath = "xs:long(99999999999999999) and xs:long(-99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3886,10 +3782,9 @@ String xpath = "xs:unsignedLong(0) and xs:unsignedLong(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3923,10 +3818,9 @@ String xpath = "xs:unsignedLong(0) and xs:unsignedLong(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3960,10 +3854,9 @@ String xpath = "xs:unsignedLong(1) and xs:unsignedLong(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3997,10 +3890,9 @@ String xpath = "xs:unsignedLong(1) and xs:unsignedLong(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4034,10 +3926,9 @@ String xpath = "xs:unsignedLong(9223372036854775807) and xs:unsignedLong(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4071,10 +3962,9 @@ String xpath = "xs:unsignedLong(9223372036854775807) and xs:unsignedLong(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4108,10 +3998,9 @@ String xpath = "xs:unsignedLong(99999999999999999) and xs:unsignedLong(99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4145,10 +4034,9 @@ String xpath = "xs:int(0) and xs:int(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4182,10 +4070,9 @@ String xpath = "xs:int(0) and xs:int(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4219,10 +4106,9 @@ String xpath = "xs:int(-1) and xs:int(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4256,10 +4142,9 @@ String xpath = "xs:int(1) and xs:int(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4293,10 +4178,9 @@ String xpath = "xs:int(2147483647) and xs:int(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4330,10 +4214,9 @@ String xpath = "xs:int(2147483647) and xs:int(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4367,10 +4250,9 @@ String xpath = "xs:int(-2147483648) and xs:int(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4404,10 +4286,9 @@ String xpath = "xs:int(-2147483648) and xs:int(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4441,10 +4322,9 @@ String xpath = "xs:int(2147483647) and xs:int(-2147483648)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4478,10 +4358,9 @@ String xpath = "xs:unsignedInt(0) and xs:unsignedInt(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4515,10 +4394,9 @@ String xpath = "xs:unsignedInt(0) and xs:unsignedInt(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4552,10 +4430,9 @@ String xpath = "xs:unsignedInt(1) and xs:unsignedInt(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4589,10 +4466,9 @@ String xpath = "xs:unsignedInt(1) and xs:unsignedInt(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4626,10 +4502,9 @@ String xpath = "xs:unsignedInt(4294967295) and xs:unsignedInt(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4663,10 +4538,9 @@ String xpath = "xs:unsignedInt(4294967295) and xs:unsignedInt(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4700,10 +4574,9 @@ String xpath = "xs:unsignedInt(4294967295) and xs:unsignedInt(4294967295)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4737,10 +4610,9 @@ String xpath = "xs:short(0) and xs:short(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4774,10 +4646,9 @@ String xpath = "xs:short(0) and xs:short(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4811,10 +4682,9 @@ String xpath = "xs:short(-1) and xs:short(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4848,10 +4718,9 @@ String xpath = "xs:short(1) and xs:short(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4885,10 +4754,9 @@ String xpath = "xs:short(32767) and xs:short(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4922,10 +4790,9 @@ String xpath = "xs:short(32767) and xs:short(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4959,10 +4826,9 @@ String xpath = "xs:short(-32768) and xs:short(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -4996,10 +4862,9 @@ String xpath = "xs:short(-32768) and xs:short(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5033,10 +4898,9 @@ String xpath = "xs:short(32767) and xs:short(-32768)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5070,10 +4934,9 @@ String xpath = "xs:unsignedShort(0) and xs:unsignedShort(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5107,10 +4970,9 @@ String xpath = "xs:unsignedShort(0) and xs:unsignedShort(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5144,10 +5006,9 @@ String xpath = "xs:unsignedShort(1) and xs:unsignedShort(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5181,10 +5042,9 @@ String xpath = "xs:unsignedShort(1) and xs:unsignedShort(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5218,10 +5078,9 @@ String xpath = "xs:unsignedShort(65535) and xs:unsignedShort(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5255,10 +5114,9 @@ String xpath = "xs:unsignedShort(65535) and xs:unsignedShort(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5292,10 +5150,9 @@ String xpath = "xs:unsignedShort(65535) and xs:unsignedShort(65535)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5329,10 +5186,9 @@ String xpath = "xs:byte(0) and xs:byte(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5366,10 +5222,9 @@ String xpath = "xs:byte(0) and xs:byte(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5403,10 +5258,9 @@ String xpath = "xs:byte(-1) and xs:byte(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5440,10 +5294,9 @@ String xpath = "xs:byte(1) and xs:byte(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5477,10 +5330,9 @@ String xpath = "xs:byte(127) and xs:byte(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5514,10 +5366,9 @@ String xpath = "xs:byte(127) and xs:byte(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5551,10 +5402,9 @@ String xpath = "xs:byte(-128) and xs:byte(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5588,10 +5438,9 @@ String xpath = "xs:byte(-128) and xs:byte(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5625,10 +5474,9 @@ String xpath = "xs:byte(127) and xs:byte(-128)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5662,10 +5510,9 @@ String xpath = "xs:unsignedByte(0) and xs:unsignedByte(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5699,10 +5546,9 @@ String xpath = "xs:unsignedByte(0) and xs:unsignedByte(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5736,10 +5582,9 @@ String xpath = "xs:unsignedByte(1) and xs:unsignedByte(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5773,10 +5618,9 @@ String xpath = "xs:unsignedByte(1) and xs:unsignedByte(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5810,10 +5654,9 @@ String xpath = "xs:unsignedByte(255) and xs:unsignedByte(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5847,10 +5690,9 @@ String xpath = "xs:unsignedByte(255) and xs:unsignedByte(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5884,10 +5726,9 @@ String xpath = "xs:unsignedByte(255) and xs:unsignedByte(255)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5921,10 +5762,9 @@ String xpath = "false() or false()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5958,10 +5798,9 @@ String xpath = "false() or true()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -5995,10 +5834,9 @@ String xpath = "false() or true()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6032,10 +5870,9 @@ String xpath = "true() or true()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6069,10 +5906,9 @@ String xpath = "() or ()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6106,10 +5942,9 @@ String xpath = "(1) or ()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6143,10 +5978,9 @@ String xpath = "() or (1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6180,10 +6014,9 @@ String xpath = "(1) or (1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6217,10 +6050,9 @@ String xpath = "(0) or ()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6254,10 +6086,9 @@ String xpath = "() or (0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6291,10 +6122,9 @@ String xpath = "(0) or (0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6328,10 +6158,9 @@ String xpath = "(1) or (0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6365,10 +6194,9 @@ String xpath = "(0) or (1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6402,10 +6230,9 @@ String xpath = "(0) or ($input-context/bib/book/price/text())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6439,10 +6266,9 @@ String xpath = "($input-context/bib/book/price/text()) or (1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6476,10 +6302,9 @@ String xpath = "($input-context/bib/book/price/text()) or ($input-context/bib/book/price/text())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6513,10 +6338,9 @@ String xpath = "\"\" or ''"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6550,10 +6374,9 @@ String xpath = "\"\" or 'a'"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6587,10 +6410,9 @@ String xpath = "\"0\" or ''"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6624,10 +6446,9 @@ String xpath = "\"a\" or '0'"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6661,10 +6482,9 @@ String xpath = "xs:string(\"\") or xs:string('')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6698,10 +6518,9 @@ String xpath = "xs:string(\"\") or xs:string('abc')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6735,10 +6554,9 @@ String xpath = "xs:string(\"abc\") or xs:string('')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6772,10 +6590,9 @@ String xpath = "xs:string(\"0\") or xs:string('abc')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6809,10 +6626,9 @@ String xpath = "xs:untypedAtomic('') or xs:untypedAtomic(\"\")"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6846,10 +6662,9 @@ String xpath = "xs:untypedAtomic('abc') or xs:untypedAtomic(\"\")"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6883,10 +6698,9 @@ String xpath = "xs:untypedAtomic('') or xs:untypedAtomic(\"0\")"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6920,10 +6734,9 @@ String xpath = "xs:untypedAtomic('abc') or xs:untypedAtomic(\"0\")"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6957,10 +6770,9 @@ String xpath = "0 or 0"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -6994,10 +6806,9 @@ String xpath = "0 or 1"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7031,10 +6842,9 @@ String xpath = "1 or 0"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7068,10 +6878,9 @@ String xpath = "-1 or 1"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7105,10 +6914,9 @@ String xpath = "-1 or 1"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7142,10 +6950,9 @@ String xpath = "xs:float(0) or xs:float(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7179,10 +6986,9 @@ String xpath = "xs:float(0) or xs:float(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7216,10 +7022,9 @@ String xpath = "xs:float(-1) or xs:float(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7253,10 +7058,9 @@ String xpath = "xs:float(1) or xs:float(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7290,10 +7094,9 @@ String xpath = "xs:float('NaN') or xs:float(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7327,10 +7130,9 @@ String xpath = "xs:float('NaN') or xs:float(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7364,10 +7166,9 @@ String xpath = "xs:float('NaN') or xs:float('NaN')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7401,10 +7202,9 @@ String xpath = "xs:float('INF') or xs:float(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7438,10 +7238,9 @@ String xpath = "xs:float('INF') or xs:float(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7475,10 +7274,9 @@ String xpath = "xs:float('INF') or xs:float('NaN')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7512,10 +7310,9 @@ String xpath = "xs:float('-INF') or xs:float(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7549,10 +7346,9 @@ String xpath = "xs:float('-INF') or xs:float(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7586,10 +7382,9 @@ String xpath = "xs:float('-INF') or xs:float('NaN')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7623,10 +7418,9 @@ String xpath = "xs:float('-INF') or xs:float('INF')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7660,10 +7454,9 @@ String xpath = "xs:double(0) or xs:double(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7697,10 +7490,9 @@ String xpath = "xs:double(0) or xs:double(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7734,10 +7526,9 @@ String xpath = "xs:double(-1) or xs:double(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7771,10 +7562,9 @@ String xpath = "xs:double(1) or xs:double(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7808,10 +7598,9 @@ String xpath = "xs:double('NaN') or xs:double(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7845,10 +7634,9 @@ String xpath = "xs:double('NaN') or xs:double(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7882,10 +7670,9 @@ String xpath = "xs:double('NaN') or xs:double('NaN')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7919,10 +7706,9 @@ String xpath = "xs:double('INF') or xs:double(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7956,10 +7742,9 @@ String xpath = "xs:double('INF') or xs:double(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -7993,10 +7778,9 @@ String xpath = "xs:double('INF') or xs:double('NaN')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8030,10 +7814,9 @@ String xpath = "xs:double('-INF') or xs:double(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8067,10 +7850,9 @@ String xpath = "xs:double('-INF') or xs:double(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8104,10 +7886,9 @@ String xpath = "xs:double('-INF') or xs:double('NaN')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8141,10 +7922,9 @@ String xpath = "xs:double('-INF') or xs:double('INF')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8178,10 +7958,9 @@ String xpath = "xs:decimal(0) or xs:decimal(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8215,10 +7994,9 @@ String xpath = "xs:decimal(0) or xs:decimal(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8252,10 +8030,9 @@ String xpath = "xs:decimal(-1) or xs:decimal(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8289,10 +8066,9 @@ String xpath = "xs:decimal(1) or xs:decimal(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8326,10 +8102,9 @@ String xpath = "xs:decimal(9.99999999999999999999999999) or xs:decimal(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8363,10 +8138,9 @@ String xpath = "xs:decimal(-123456789.123456789123456789) or xs:decimal(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8400,10 +8174,9 @@ String xpath = "xs:decimal(9.99999999999999999999999999) or xs:decimal(-123456789.123456789123456789)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8437,10 +8210,9 @@ String xpath = "xs:integer(0) or xs:integer(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8474,10 +8246,9 @@ String xpath = "xs:integer(0) or xs:integer(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8511,10 +8282,9 @@ String xpath = "xs:integer(-1) or xs:integer(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8548,10 +8318,9 @@ String xpath = "xs:integer(1) or xs:integer(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8585,10 +8354,9 @@ String xpath = "xs:integer(99999999999999999) or xs:integer(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8622,10 +8390,9 @@ String xpath = "xs:integer(-99999999999999999) or xs:integer(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8659,10 +8426,9 @@ String xpath = "xs:integer(99999999999999999) or xs:integer(-99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8696,10 +8462,9 @@ String xpath = "xs:nonPositiveInteger(0) or xs:nonPositiveInteger(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8733,10 +8498,9 @@ String xpath = "xs:nonPositiveInteger(0) or xs:nonPositiveInteger(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8770,10 +8534,9 @@ String xpath = "xs:nonPositiveInteger(-1) or xs:nonPositiveInteger(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8807,10 +8570,9 @@ String xpath = "xs:nonPositiveInteger(-1) or xs:nonPositiveInteger(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8844,10 +8606,9 @@ String xpath = "xs:nonPositiveInteger(-99999999999999999) or xs:nonPositiveInteger(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8881,10 +8642,9 @@ String xpath = " xs:nonPositiveInteger(-1) or xs:nonPositiveInteger(-99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8918,10 +8678,9 @@ String xpath = "xs:nonPositiveInteger(-99999999999999999) or xs:nonPositiveInteger(-99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8955,10 +8714,9 @@ String xpath = "xs:nonNegativeInteger(0) or xs:nonNegativeInteger(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -8992,10 +8750,9 @@ String xpath = "xs:nonNegativeInteger(0) or xs:nonNegativeInteger(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9029,10 +8786,9 @@ String xpath = "xs:nonNegativeInteger(1) or xs:nonNegativeInteger(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9066,10 +8822,9 @@ String xpath = "xs:nonNegativeInteger(1) or xs:nonNegativeInteger(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9103,10 +8858,9 @@ String xpath = "xs:nonNegativeInteger(99999999999999999) or xs:nonNegativeInteger(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9140,10 +8894,9 @@ String xpath = "xs:nonNegativeInteger(99999999999999999) or xs:nonNegativeInteger(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9177,10 +8930,9 @@ String xpath = "xs:nonNegativeInteger(99999999999999999) or xs:nonNegativeInteger(99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9214,10 +8966,9 @@ String xpath = "xs:negativeInteger(-1) or xs:negativeInteger(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9251,10 +9002,9 @@ String xpath = "xs:negativeInteger(-99999999999999999) or xs:negativeInteger(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9288,10 +9038,9 @@ String xpath = "xs:negativeInteger(-99999999999999999) or xs:negativeInteger(-99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9325,10 +9074,9 @@ String xpath = "xs:positiveInteger(1) or xs:positiveInteger(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9362,10 +9110,9 @@ String xpath = "xs:positiveInteger(99999999999999999) or xs:positiveInteger(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9399,10 +9146,9 @@ String xpath = "xs:positiveInteger(99999999999999999) or xs:positiveInteger(99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9436,10 +9182,9 @@ String xpath = "xs:long(0) or xs:long(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9473,10 +9218,9 @@ String xpath = "xs:long(0) or xs:long(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9510,10 +9254,9 @@ String xpath = "xs:long(-1) or xs:long(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9547,10 +9290,9 @@ String xpath = "xs:long(1) or xs:long(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9584,10 +9326,9 @@ String xpath = "xs:long(9223372036854775807) or xs:long(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9621,10 +9362,9 @@ String xpath = "xs:long(9223372036854775807) or xs:long(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9658,10 +9398,9 @@ String xpath = "xs:long(-99999999999999999) or xs:long(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9695,10 +9434,9 @@ String xpath = "xs:long(-99999999999999999) or xs:long(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9732,10 +9470,9 @@ String xpath = " xs:long(99999999999999999) or xs:long(-99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9769,10 +9506,9 @@ String xpath = "xs:unsignedLong(0) or xs:unsignedLong(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9806,10 +9542,9 @@ String xpath = "xs:unsignedLong(0) or xs:unsignedLong(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9843,10 +9578,9 @@ String xpath = " xs:unsignedLong(1) or xs:unsignedLong(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9880,10 +9614,9 @@ String xpath = "xs:unsignedLong(1) or xs:unsignedLong(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9917,10 +9650,9 @@ String xpath = "xs:unsignedLong(9223372036854775807) or xs:unsignedLong(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9954,10 +9686,9 @@ String xpath = "xs:unsignedLong(9223372036854775807) or xs:unsignedLong(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -9991,10 +9722,9 @@ String xpath = "xs:unsignedLong(99999999999999999) or xs:unsignedLong(99999999999999999)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10028,10 +9758,9 @@ String xpath = "xs:int(0) or xs:int(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10065,10 +9794,9 @@ String xpath = "xs:int(0) or xs:int(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10102,10 +9830,9 @@ String xpath = "xs:int(-1) or xs:int(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10139,10 +9866,9 @@ String xpath = "xs:int(1) or xs:int(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10176,10 +9902,9 @@ String xpath = "xs:int(2147483647) or xs:int(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10213,10 +9938,9 @@ String xpath = "xs:int(2147483647) or xs:int(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10250,10 +9974,9 @@ String xpath = "xs:int(-2147483648) or xs:int(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10287,10 +10010,9 @@ String xpath = "xs:int(-2147483648) or xs:int(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10324,10 +10046,9 @@ String xpath = "xs:int(2147483647) or xs:int(-2147483648)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10361,10 +10082,9 @@ String xpath = "xs:unsignedInt(0) or xs:unsignedInt(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10398,10 +10118,9 @@ String xpath = "xs:unsignedInt(0) or xs:unsignedInt(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10435,10 +10154,9 @@ String xpath = "xs:unsignedInt(1) or xs:unsignedInt(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10472,10 +10190,9 @@ String xpath = "xs:unsignedInt(1) or xs:unsignedInt(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10509,10 +10226,9 @@ String xpath = "xs:unsignedInt(4294967295) or xs:unsignedInt(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10546,10 +10262,9 @@ String xpath = "xs:unsignedInt(4294967295) or xs:unsignedInt(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10583,10 +10298,9 @@ String xpath = "xs:unsignedInt(4294967295) or xs:unsignedInt(4294967295)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10620,10 +10334,9 @@ String xpath = "xs:short(0) or xs:short(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10657,10 +10370,9 @@ String xpath = "xs:short(0) or xs:short(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10694,10 +10406,9 @@ String xpath = "xs:short(-1) or xs:short(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10731,10 +10442,9 @@ String xpath = "xs:short(1) or xs:short(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10768,10 +10478,9 @@ String xpath = "xs:short(32767) or xs:short(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10805,10 +10514,9 @@ String xpath = "xs:short(32767) or xs:short(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10842,10 +10550,9 @@ String xpath = "xs:short(-32768) or xs:short(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10879,10 +10586,9 @@ String xpath = "xs:short(-32768) or xs:short(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10916,10 +10622,9 @@ String xpath = "xs:short(32767) or xs:short(-32768)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10953,10 +10658,9 @@ String xpath = "xs:unsignedShort(0) or xs:unsignedShort(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -10990,10 +10694,9 @@ String xpath = "xs:unsignedShort(0) or xs:unsignedShort(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11027,10 +10730,9 @@ String xpath = "xs:unsignedShort(1) or xs:unsignedShort(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11064,10 +10766,9 @@ String xpath = "xs:unsignedShort(1) or xs:unsignedShort(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11101,10 +10802,9 @@ String xpath = "xs:unsignedShort(65535) or xs:unsignedShort(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11138,10 +10838,9 @@ String xpath = "xs:unsignedShort(65535) or xs:unsignedShort(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11175,10 +10874,9 @@ String xpath = "xs:unsignedShort(65535) or xs:unsignedShort(65535)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11212,10 +10910,9 @@ String xpath = "xs:byte(0) or xs:byte(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11249,10 +10946,9 @@ String xpath = "xs:byte(0) or xs:byte(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11286,10 +10982,9 @@ String xpath = "xs:byte(-1) or xs:byte(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11323,10 +11018,9 @@ String xpath = "xs:byte(1) or xs:byte(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11360,10 +11054,9 @@ String xpath = " xs:byte(127) or xs:byte(0) "; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11397,10 +11090,9 @@ String xpath = "xs:byte(127) or xs:byte(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11434,10 +11126,9 @@ String xpath = "xs:byte(-128) or xs:byte(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11471,10 +11162,9 @@ String xpath = "xs:byte(-128) or xs:byte(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11508,10 +11198,9 @@ String xpath = "xs:byte(127) or xs:byte(-128)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11545,10 +11234,9 @@ String xpath = "xs:unsignedByte(0) or xs:unsignedByte(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11582,10 +11270,9 @@ String xpath = "xs:unsignedByte(0) or xs:unsignedByte(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11619,10 +11306,9 @@ String xpath = "xs:unsignedByte(1) or xs:unsignedByte(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11656,10 +11342,9 @@ String xpath = "xs:unsignedByte(1) or xs:unsignedByte(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11693,10 +11378,9 @@ String xpath = "xs:unsignedByte(255) or xs:unsignedByte(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11730,10 +11414,9 @@ String xpath = "xs:unsignedByte(255) or xs:unsignedByte(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -11767,10 +11450,9 @@ String xpath = "xs:unsignedByte(255) or xs:unsignedByte(255)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>";
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NameTestTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NameTestTest.java index 886ab8c..6c1983c 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NameTestTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NameTestTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -152,10 +149,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -190,10 +186,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeAfterTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeAfterTest.java index a77d7d8..eea7e4c 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeAfterTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeAfterTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -225,10 +220,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -262,10 +256,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -301,10 +294,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -338,10 +330,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -375,10 +366,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -412,10 +402,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -449,10 +438,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -486,10 +474,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -523,10 +510,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -560,10 +546,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeBeforeTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeBeforeTest.java index 5908b6a..e1a2f70 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeBeforeTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeBeforeTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -263,10 +258,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -337,10 +331,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -374,10 +367,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -411,10 +403,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -448,10 +439,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -485,10 +475,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -522,10 +511,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -559,10 +547,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeNameFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeNameFuncTest.java index 3a97de6..4ab3078 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeNameFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeNameFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeSameTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeSameTest.java index bbf6410..8430350 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeSameTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeSameTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -225,10 +220,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -262,10 +256,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -301,10 +294,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -338,10 +330,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -375,10 +366,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -412,10 +402,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -449,10 +438,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -486,10 +474,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -523,10 +510,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -560,10 +546,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeTestTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeTestTest.java index bf432b5..c0f9021 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeTestTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/NodeTestTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -113,10 +111,9 @@ String xpath = "$input-context/bib/book/editor/affiliation/text()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -150,10 +147,9 @@ String xpath = "fn:count($input-context//processing-instruction('a-pi'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<out>" + buildResultString(rs) + "</out>"; @@ -187,10 +183,9 @@ String xpath = "fn:count($input-context//processing-instruction('a-pi'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<out>" + buildResultString(rs) + "</out>"; @@ -224,10 +219,9 @@ String xpath = "fn:count($input-context//center/text())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<out>" + buildResultString(rs) + "</out>"; @@ -261,10 +255,9 @@ String xpath = "fn:count($input-context//center/text())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<out>" + buildResultString(rs) + "</out>"; @@ -298,10 +291,9 @@ String xpath = "fn:count($input-context//center/comment())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<out>" + buildResultString(rs) + "</out>"; @@ -335,10 +327,9 @@ String xpath = "fn:count($input-context//center/comment())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<out>" + buildResultString(rs) + "</out>"; @@ -372,10 +363,9 @@ String xpath = "fn:count($input-context//comment())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<out>" + buildResultString(rs) + "</out>"; @@ -409,10 +399,9 @@ String xpath = "fn:count($input-context//comment())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<out>" + buildResultString(rs) + "</out>"; @@ -446,10 +435,9 @@ String xpath = "fn:count($input-context//center/processing-instruction())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<out>" + buildResultString(rs) + "</out>"; @@ -483,10 +471,9 @@ String xpath = "fn:count($input-context//center/processing-instruction())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<out>" + buildResultString(rs) + "</out>"; @@ -520,10 +507,9 @@ String xpath = "fn:count($input-context//processing-instruction())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<out>" + buildResultString(rs) + "</out>"; @@ -557,10 +543,9 @@ String xpath = "fn:count($input-context//processing-instruction())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<out>" + buildResultString(rs) + "</out>"; @@ -594,10 +579,9 @@ String xpath = "fn:count($input-context//center/processing-instruction('a-pi'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<out>" + buildResultString(rs) + "</out>"; @@ -631,10 +615,9 @@ String xpath = "$input-context1//text() and fn:true()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildResultString(rs) + "</result>"; @@ -668,10 +651,9 @@ String xpath = "$input-context1//text() or fn:true()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildResultString(rs) + "</result>"; @@ -705,10 +687,9 @@ String xpath = "$input-context1//text() and fn:false()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildResultString(rs) + "</result>"; @@ -742,10 +723,9 @@ String xpath = "$input-context1//text() or fn:false()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildResultString(rs) + "</result>"; @@ -779,10 +759,9 @@ String xpath = "$input-context1//overtime/node() or fn:false()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildResultString(rs) + "</result>"; @@ -816,10 +795,9 @@ String xpath = "$input-context1//overtime/node() or fn:true()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildResultString(rs) + "</result>"; @@ -853,10 +831,9 @@ String xpath = "$input-context1//overtime/node() and fn:false()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildResultString(rs) + "</result>"; @@ -890,10 +867,9 @@ String xpath = "$input-context1//overtime/node() and fn:true()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildResultString(rs) + "</result>";
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ParenExprTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ParenExprTest.java index 5114a19..519cc77 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ParenExprTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ParenExprTest.java
@@ -41,10 +41,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -79,10 +78,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -117,10 +115,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -155,10 +152,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -193,10 +189,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -231,10 +226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -269,10 +263,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -307,10 +300,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -345,10 +337,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -383,10 +374,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -421,10 +411,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -459,10 +448,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + Iterator iterator = rs.iterator(); actual = new String();
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/PredicatesTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/PredicatesTest.java index c6065a9..a874400 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/PredicatesTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/PredicatesTest.java
@@ -39,10 +39,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -76,10 +75,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -113,10 +111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -150,10 +147,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -187,10 +183,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -224,10 +219,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -261,10 +255,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -298,10 +291,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -335,10 +327,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -372,10 +363,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -409,10 +399,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -446,10 +435,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -483,10 +471,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -520,10 +507,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -557,10 +543,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -594,10 +579,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -631,10 +615,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -668,10 +651,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -705,10 +687,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -742,10 +723,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -779,10 +759,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -817,10 +796,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -854,10 +832,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -891,10 +868,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -928,10 +904,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -965,10 +940,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -1005,10 +979,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1042,10 +1015,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1079,10 +1051,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1116,10 +1087,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1153,10 +1123,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1190,10 +1159,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -1227,10 +1195,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -1264,10 +1231,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -1301,10 +1267,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1338,10 +1303,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1375,10 +1339,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -1412,10 +1375,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -1449,10 +1411,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -1486,10 +1447,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -1523,10 +1483,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -1560,10 +1519,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -1597,10 +1555,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/PrefixFromQNameTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/PrefixFromQNameTest.java index 8eb8e24..a63eb74 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/PrefixFromQNameTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/PrefixFromQNameTest.java
@@ -37,10 +37,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -73,10 +72,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -110,10 +108,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -147,10 +144,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -180,15 +176,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("foo", "http://example.org"); + addNamespace("foo", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -218,15 +213,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("foo", "http://example.org"); + addNamespace("foo", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -330,15 +322,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("foo", "http://example.org"); + addNamespace("foo", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -368,15 +359,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("FOO", "http://example.org"); + addNamespace("FOO", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -406,15 +396,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("foo", "http://example.org"); + addNamespace("foo", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -444,15 +433,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("foo", "http://example.org"); + addNamespace("foo", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,15 +470,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("foo", "http://example.org"); + addNamespace("foo", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -520,15 +507,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("foo", "http://example.org"); + addNamespace("foo", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -558,15 +544,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("foo", "http://example.org"); + addNamespace("foo", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -596,15 +581,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("foo", "http://example.org"); + addNamespace("foo", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -634,15 +618,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("foo", "http://example.org"); + addNamespace("foo", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -672,15 +655,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("foo", "http://example.org"); + addNamespace("foo", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -710,15 +692,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("foo", "http://example.org"); + addNamespace("foo", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -748,15 +729,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("foo", "http://example.org"); + addNamespace("foo", "http://example.org"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/QNameEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/QNameEQTest.java index 61ec21b..afcb643 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/QNameEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/QNameEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/QuantExprTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/QuantExprTest.java index 3aaba84..7ed6467 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/QuantExprTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/QuantExprTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2036,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2073,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2110,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2147,10 +2090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2184,10 +2126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2221,10 +2162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2260,10 +2200,9 @@ "satisfies $x + $y = 4"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2298,10 +2237,9 @@ "satisfies fn:string-length($x) = 3"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2336,10 +2274,9 @@ "satisfies fn:string-length($x) = 3"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2374,10 +2311,9 @@ " satisfies fn:string-length($x) = $y"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2412,10 +2348,9 @@ "satisfies $x + $y = 5"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/QuantExprWithTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/QuantExprWithTest.java index 9c52482..c5575a5 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/QuantExprWithTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/QuantExprWithTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/RangeExprTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/RangeExprTest.java index 9472b96..ee4f012 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/RangeExprTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/RangeExprTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ReturnExprTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ReturnExprTest.java index 71ef68f..d30f6b1 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ReturnExprTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/ReturnExprTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -223,10 +218,9 @@ String xpath = "for $file in ($input-context//Folder)[1]/File return ()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<empty>" + buildXMLResultString(rs) + "</empty>"; @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -296,10 +289,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -332,10 +324,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -368,10 +359,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -405,10 +395,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -442,10 +431,9 @@ String xpath = "for $file in ($input-context//Folder)[1]/File return ($file/Stream/StreamSize)[1] + 1"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -521,10 +508,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -558,10 +544,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExceptTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExceptTest.java index e1c0c84..06090b2 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExceptTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExceptTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -515,15 +502,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -553,16 +539,15 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -592,15 +577,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -632,15 +616,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -670,16 +653,15 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -709,15 +691,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -747,15 +728,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -789,10 +769,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExprCastTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExprCastTest.java index b34a922..572eae7 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExprCastTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExprCastTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1591,10 +1549,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1628,10 +1585,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1665,10 +1621,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1702,10 +1657,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1739,10 +1693,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1776,10 +1729,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1813,10 +1765,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1850,10 +1801,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1887,10 +1837,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1924,10 +1873,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1961,10 +1909,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1997,10 +1944,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2034,10 +1980,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2071,10 +2016,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2108,10 +2052,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2145,10 +2088,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2181,10 +2123,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2217,10 +2158,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2253,10 +2193,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2289,10 +2228,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2326,10 +2264,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2362,10 +2299,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2398,10 +2334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2434,10 +2369,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2470,10 +2404,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2506,10 +2439,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2542,10 +2474,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2579,10 +2510,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2616,10 +2546,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2652,10 +2581,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2688,10 +2616,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2725,10 +2652,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2762,10 +2688,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2798,10 +2723,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2834,10 +2758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2871,10 +2794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2908,10 +2830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2944,10 +2865,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2981,10 +2901,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3018,10 +2937,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3055,10 +2973,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3091,10 +3008,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3128,10 +3044,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3165,10 +3080,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3202,10 +3116,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3238,10 +3151,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3275,10 +3187,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3312,10 +3223,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3349,10 +3259,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3385,10 +3294,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3422,10 +3330,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3459,10 +3366,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3496,10 +3402,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3532,10 +3437,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3569,10 +3473,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3606,10 +3509,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3643,10 +3545,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3679,10 +3580,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3716,10 +3616,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3753,10 +3652,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3790,10 +3688,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3826,10 +3723,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3863,10 +3759,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3900,10 +3795,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3937,10 +3831,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3973,10 +3866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4010,10 +3902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4047,10 +3938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4084,10 +3974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4120,10 +4009,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4156,10 +4044,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4193,10 +4080,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4230,10 +4116,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4267,10 +4152,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4304,10 +4188,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4341,10 +4224,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4377,10 +4259,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4413,10 +4294,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4449,10 +4329,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4486,10 +4365,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4523,10 +4401,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4560,10 +4437,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4597,10 +4473,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4634,10 +4509,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4671,10 +4545,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4708,10 +4581,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4745,10 +4617,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4782,10 +4653,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4819,10 +4689,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4856,10 +4725,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4893,10 +4761,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4930,10 +4797,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4967,10 +4833,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5003,10 +4868,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5040,10 +4904,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5077,10 +4940,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5114,10 +4976,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5151,10 +5012,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5187,10 +5047,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5223,10 +5082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5259,10 +5117,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5295,10 +5152,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5332,10 +5188,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5368,10 +5223,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5404,10 +5258,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5440,10 +5293,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5476,10 +5328,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5512,10 +5363,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5548,10 +5398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5585,10 +5434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5622,10 +5470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5658,10 +5505,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5694,10 +5540,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5731,10 +5576,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5768,10 +5612,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5804,10 +5647,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5840,10 +5682,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5877,10 +5718,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5914,10 +5754,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5950,10 +5789,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5987,10 +5825,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6024,10 +5861,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6061,10 +5897,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6097,10 +5932,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6134,10 +5968,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6171,10 +6004,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6208,10 +6040,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6244,10 +6075,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6281,10 +6111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6318,10 +6147,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6355,10 +6183,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6391,10 +6218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6428,10 +6254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6465,10 +6290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6502,10 +6326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6538,10 +6361,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6575,10 +6397,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6612,10 +6433,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6649,10 +6469,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6685,10 +6504,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6722,10 +6540,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6759,10 +6576,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6796,10 +6612,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6832,10 +6647,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6869,10 +6683,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6906,10 +6719,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6943,10 +6755,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6979,10 +6790,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7016,10 +6826,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7053,10 +6862,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7090,10 +6898,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7126,10 +6933,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7162,10 +6968,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7199,10 +7004,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7236,10 +7040,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7273,10 +7076,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7310,10 +7112,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7347,10 +7148,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7383,10 +7183,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7419,10 +7218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7456,10 +7254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7493,10 +7290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7530,10 +7326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7567,10 +7362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7604,10 +7398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7641,10 +7434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7678,10 +7470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7715,10 +7506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7752,10 +7542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7789,10 +7578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7826,10 +7614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7863,10 +7650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7900,10 +7686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7937,10 +7722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7974,10 +7758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8011,10 +7794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8048,10 +7830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8085,10 +7866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8122,10 +7902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8159,10 +7938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8195,10 +7973,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8231,10 +8008,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8267,10 +8043,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8303,10 +8078,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8339,10 +8113,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8375,10 +8148,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8411,10 +8183,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8447,10 +8218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8483,10 +8253,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8519,10 +8288,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8555,10 +8323,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8591,10 +8358,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8628,10 +8394,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8665,10 +8430,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8702,10 +8466,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8739,10 +8502,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8775,10 +8537,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8811,10 +8572,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8847,10 +8607,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8884,10 +8643,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8921,10 +8679,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8958,10 +8715,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8995,10 +8751,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9032,10 +8787,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9069,10 +8823,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9106,10 +8859,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9143,10 +8895,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9180,10 +8931,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9217,10 +8967,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9254,10 +9003,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9291,10 +9039,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9328,10 +9075,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9365,10 +9111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9401,10 +9146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9438,10 +9182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9475,10 +9218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9512,10 +9254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9548,10 +9289,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9584,10 +9324,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9620,10 +9359,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9656,10 +9394,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9692,10 +9429,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9728,10 +9464,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9764,10 +9499,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9800,10 +9534,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9836,10 +9569,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9872,10 +9604,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9908,10 +9639,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9944,10 +9674,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9980,10 +9709,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10017,10 +9745,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10053,10 +9780,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10089,10 +9815,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10125,10 +9850,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10162,10 +9886,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10199,10 +9922,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10236,10 +9958,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10273,10 +9994,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10310,10 +10030,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10347,10 +10066,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10384,10 +10102,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10420,10 +10137,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10456,10 +10172,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10492,10 +10207,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10528,10 +10242,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10564,10 +10277,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10600,10 +10312,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10636,10 +10347,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10672,10 +10382,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10708,10 +10417,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10744,10 +10452,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10780,10 +10487,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10817,10 +10523,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10853,10 +10558,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10889,10 +10593,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10925,10 +10628,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10962,10 +10664,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10999,10 +10700,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11036,10 +10736,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11073,10 +10772,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11110,10 +10808,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11147,10 +10844,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11183,10 +10879,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11219,10 +10914,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11255,10 +10949,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11291,10 +10984,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11327,10 +11019,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11363,10 +11054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11399,10 +11089,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11435,10 +11124,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11471,10 +11159,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11507,10 +11194,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11543,10 +11229,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11580,10 +11265,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11616,10 +11300,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11652,10 +11335,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11688,10 +11370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11725,10 +11406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11762,10 +11442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11798,10 +11477,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11834,10 +11512,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11870,10 +11547,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11906,10 +11582,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11943,10 +11618,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11980,10 +11654,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12017,10 +11690,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12054,10 +11726,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12091,10 +11762,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12128,10 +11798,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12165,10 +11834,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12202,10 +11870,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12238,10 +11905,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12274,10 +11940,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12310,10 +11975,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12346,10 +12010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12382,10 +12045,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12418,10 +12080,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12454,10 +12115,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12490,10 +12150,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12526,10 +12185,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12562,10 +12220,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12598,10 +12255,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12634,10 +12290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12671,10 +12326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12708,10 +12362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12744,10 +12397,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12780,10 +12432,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12816,10 +12467,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12852,10 +12502,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12889,10 +12538,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12926,10 +12574,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12963,10 +12610,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13000,10 +12646,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13036,10 +12681,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13072,10 +12716,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13108,10 +12751,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13144,10 +12786,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13180,10 +12821,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13216,10 +12856,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13252,10 +12891,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13288,10 +12926,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13324,10 +12961,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13360,10 +12996,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13396,10 +13031,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13432,10 +13066,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13469,10 +13102,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13506,10 +13138,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13543,10 +13174,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13580,10 +13210,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13616,10 +13245,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13652,10 +13280,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13688,10 +13315,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13724,10 +13350,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13761,10 +13386,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13798,10 +13422,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13835,10 +13458,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13872,10 +13494,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13909,10 +13530,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13946,10 +13566,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13983,10 +13602,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14019,10 +13637,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14055,10 +13672,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14091,10 +13707,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14127,10 +13742,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14163,10 +13777,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14199,10 +13812,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14235,10 +13847,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14271,10 +13882,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14307,10 +13917,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14343,10 +13952,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14379,10 +13987,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14415,10 +14022,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14452,10 +14058,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14489,10 +14094,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14526,10 +14130,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14563,10 +14166,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14599,10 +14201,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14635,10 +14236,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14671,10 +14271,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14707,10 +14306,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14743,10 +14341,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14779,10 +14376,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14815,10 +14411,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14852,10 +14447,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14889,10 +14483,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14926,10 +14519,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14963,10 +14555,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15000,10 +14591,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15037,10 +14627,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15074,10 +14663,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15111,10 +14699,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15148,10 +14735,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15185,10 +14771,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15222,10 +14807,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15259,10 +14843,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15296,10 +14879,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15333,10 +14915,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15370,10 +14951,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15406,10 +14986,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15442,10 +15021,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15478,10 +15056,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15514,10 +15091,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15551,10 +15127,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15588,10 +15163,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15624,10 +15198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15660,10 +15233,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15696,10 +15268,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15732,10 +15303,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15768,10 +15338,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15804,10 +15373,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15840,10 +15408,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15876,10 +15443,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15913,10 +15479,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15950,10 +15515,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15987,10 +15551,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16023,10 +15586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16059,10 +15621,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16095,10 +15656,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16131,10 +15691,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16167,10 +15726,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16203,10 +15761,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16239,10 +15796,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16275,10 +15831,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16311,10 +15866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16347,10 +15901,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16384,10 +15937,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16421,10 +15973,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16458,10 +16009,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16495,10 +16045,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16531,10 +16080,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16567,10 +16115,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16603,10 +16150,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16639,10 +16185,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16675,10 +16220,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16711,10 +16255,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16747,10 +16290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16784,10 +16326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16820,10 +16361,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16857,10 +16397,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16894,10 +16433,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16931,10 +16469,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16968,10 +16505,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17005,10 +16541,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17042,10 +16577,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17079,10 +16613,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17116,10 +16649,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17153,10 +16685,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17190,10 +16721,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17227,10 +16757,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17264,10 +16793,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17301,10 +16829,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17337,10 +16864,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17373,10 +16899,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17409,10 +16934,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17445,10 +16969,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17482,10 +17005,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17519,10 +17041,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17555,10 +17076,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17591,10 +17111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17627,10 +17146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17663,10 +17181,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17699,10 +17216,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17735,10 +17251,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17771,10 +17286,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17807,10 +17321,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17843,10 +17356,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17879,10 +17391,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17915,10 +17426,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17952,10 +17462,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17989,10 +17498,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18026,10 +17534,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18062,10 +17569,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18098,10 +17604,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18134,10 +17639,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18170,10 +17674,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18206,10 +17709,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18242,10 +17744,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18278,10 +17779,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18314,10 +17814,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18351,10 +17850,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18388,10 +17886,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18424,10 +17921,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18460,10 +17956,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18496,10 +17991,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18532,10 +18026,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18568,10 +18061,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18604,10 +18096,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18640,10 +18131,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18676,10 +18166,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18712,10 +18201,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18748,10 +18236,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18785,10 +18272,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18822,10 +18308,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18859,10 +18344,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18895,10 +18379,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18931,10 +18414,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18967,10 +18449,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19003,10 +18484,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19039,10 +18519,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19075,10 +18554,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19111,10 +18589,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19148,10 +18625,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19185,10 +18661,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19221,10 +18696,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19257,10 +18731,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19293,10 +18766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19329,10 +18801,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19365,10 +18836,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19401,10 +18871,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19437,10 +18906,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19473,10 +18941,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19509,10 +18976,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19545,10 +19011,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19581,10 +19046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19617,10 +19081,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19654,10 +19117,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19691,10 +19153,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19728,10 +19189,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19764,10 +19224,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19800,10 +19259,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19836,10 +19294,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19872,10 +19329,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19908,10 +19364,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19944,10 +19399,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19981,10 +19435,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20018,10 +19471,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20054,10 +19506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20090,10 +19541,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20126,10 +19576,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20162,10 +19611,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20198,10 +19646,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20234,10 +19681,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20270,10 +19716,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20306,10 +19751,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20342,10 +19786,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20378,10 +19821,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20414,10 +19856,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20450,10 +19891,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20486,10 +19926,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20523,10 +19962,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20560,10 +19998,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20597,10 +20034,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20633,10 +20069,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20669,10 +20104,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20705,10 +20139,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20741,10 +20174,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20777,10 +20209,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20814,10 +20245,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20851,10 +20281,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20887,10 +20316,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20923,10 +20351,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20959,10 +20386,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20995,10 +20421,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21031,10 +20456,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21067,10 +20491,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21103,10 +20526,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21139,10 +20561,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21175,10 +20596,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21211,10 +20631,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21247,10 +20666,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21283,10 +20701,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21319,10 +20736,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21355,10 +20771,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21392,10 +20807,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21429,10 +20843,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21466,10 +20879,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21502,10 +20914,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21538,10 +20949,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21574,10 +20984,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21610,10 +21019,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21647,10 +21055,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21684,10 +21091,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21721,10 +21127,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21758,10 +21163,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21795,10 +21199,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21832,10 +21235,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21869,10 +21271,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21906,10 +21307,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21943,10 +21343,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21980,10 +21379,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22016,10 +21414,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22052,10 +21449,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22088,10 +21484,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22124,10 +21519,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22160,10 +21554,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22196,10 +21589,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22232,10 +21624,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22268,10 +21659,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22304,10 +21694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22340,10 +21729,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22376,10 +21764,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22413,10 +21800,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22450,10 +21836,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22486,10 +21871,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22522,10 +21906,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22558,10 +21941,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22595,10 +21977,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22632,10 +22013,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22669,10 +22049,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22706,10 +22085,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22742,10 +22120,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22778,10 +22155,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22814,10 +22190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22850,10 +22225,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22886,10 +22260,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22922,10 +22295,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22958,10 +22330,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22994,10 +22365,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23030,10 +22400,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23066,10 +22435,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23102,10 +22470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23138,10 +22505,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23174,10 +22540,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23210,10 +22575,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23246,10 +22610,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23282,10 +22645,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23319,10 +22681,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23356,10 +22717,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23393,10 +22753,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23430,10 +22789,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23467,10 +22825,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23504,10 +22861,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23540,10 +22896,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23577,10 +22932,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23614,10 +22968,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23650,10 +23003,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23686,10 +23038,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23722,10 +23073,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23758,10 +23108,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23794,10 +23143,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23830,10 +23178,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23866,10 +23213,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23902,10 +23248,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23938,10 +23283,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23974,10 +23318,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24010,10 +23353,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24046,10 +23388,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24082,10 +23423,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24118,10 +23458,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24154,10 +23493,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24190,10 +23528,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24227,10 +23564,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24264,10 +23600,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24301,10 +23636,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24338,10 +23672,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24374,10 +23707,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24411,10 +23743,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24448,10 +23779,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24484,10 +23814,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24520,10 +23849,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24556,10 +23884,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24592,10 +23919,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24628,10 +23954,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24664,10 +23989,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24700,10 +24024,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24736,10 +24059,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24772,10 +24094,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24808,10 +24129,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24844,10 +24164,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24880,10 +24199,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24916,10 +24234,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24952,10 +24269,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -24988,10 +24304,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25024,10 +24339,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25060,10 +24374,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25096,10 +24409,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25133,10 +24445,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25170,10 +24481,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25207,10 +24517,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25244,10 +24553,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25281,10 +24589,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25318,10 +24625,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25355,10 +24661,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25392,10 +24697,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25429,10 +24733,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25466,10 +24769,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25503,10 +24805,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25540,10 +24841,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25577,10 +24877,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25614,10 +24913,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25650,10 +24948,9 @@ String xpath = "xs:long(120) cast as xs:short"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25686,10 +24983,9 @@ String xpath = "xs:short(120) cast as xs:long"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25722,10 +25018,9 @@ String xpath = "xs:nonPositiveInteger(-120) cast as xs:negativeInteger"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25758,10 +25053,9 @@ String xpath = "xs:nonNegativeInteger(120) cast as xs:positiveInteger"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25794,10 +25088,9 @@ String xpath = "xs:short(120) cast as xs:unsignedShort"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25830,10 +25123,9 @@ String xpath = "xs:int(120) cast as xs:long"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25867,10 +25159,9 @@ String xpath = "xs:long(120) cast as xs:int"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25903,10 +25194,9 @@ String xpath = "xs:unsignedShort(120) cast as xs:unsignedInt"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25939,10 +25229,9 @@ String xpath = "xs:unsignedInt(120) cast as xs:unsignedShort"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -25975,10 +25264,9 @@ String xpath = "xs:byte(120) cast as xs:unsignedByte"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -26012,10 +25300,9 @@ String xpath = "xs:date('2006-07-12') + xs:yearMonthDuration('P9000Y')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -26048,10 +25335,9 @@ String xpath = "\"abc\" cast as xs:ENTITY"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -26085,10 +25371,9 @@ String xpath = "(\"a\",\"b\",\"c\") cast as xs:ENTITY"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -26124,10 +25409,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -26160,10 +25444,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExprCastableTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExprCastableTest.java index 3928302..e4a7e1e 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExprCastableTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExprCastableTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2036,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2073,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2110,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2147,10 +2090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2184,10 +2126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2221,10 +2162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2258,10 +2198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2295,10 +2234,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2332,10 +2270,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2369,10 +2306,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2406,10 +2342,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2443,10 +2378,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2480,10 +2414,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2517,10 +2450,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2554,10 +2486,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2591,10 +2522,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2628,10 +2558,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2665,10 +2594,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2702,10 +2630,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2739,10 +2666,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2776,10 +2702,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2813,10 +2738,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2850,10 +2774,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2887,10 +2810,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2924,10 +2846,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2961,10 +2882,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2998,10 +2918,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3035,10 +2954,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3072,10 +2990,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3109,10 +3026,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3146,10 +3062,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3183,10 +3098,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3220,10 +3134,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3257,10 +3170,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3294,10 +3206,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3331,10 +3242,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3368,10 +3278,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3405,10 +3314,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3442,10 +3350,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3479,10 +3386,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3516,10 +3422,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3553,10 +3458,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3590,10 +3494,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3627,10 +3530,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3664,10 +3566,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3701,10 +3602,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3738,10 +3638,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3775,10 +3674,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3812,10 +3710,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3849,10 +3746,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3886,10 +3782,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3923,10 +3818,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3960,10 +3854,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3997,10 +3890,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4034,10 +3926,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4071,10 +3962,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4108,10 +3998,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4145,10 +4034,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4182,10 +4070,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4219,10 +4106,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4256,10 +4142,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4293,10 +4178,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4330,10 +4214,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4367,10 +4250,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4404,10 +4286,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4441,10 +4322,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4478,10 +4358,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4515,10 +4394,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4552,10 +4430,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4589,10 +4466,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4626,10 +4502,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4663,10 +4538,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4700,10 +4574,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4737,10 +4610,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4774,10 +4646,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4811,10 +4682,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4848,10 +4718,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4885,10 +4754,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4922,10 +4790,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4959,10 +4826,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4996,10 +4862,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5033,10 +4898,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5070,10 +4934,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5107,10 +4970,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5144,10 +5006,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5181,10 +5042,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5218,10 +5078,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5255,10 +5114,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5292,10 +5150,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5329,10 +5186,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5366,10 +5222,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5403,10 +5258,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5440,10 +5294,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5477,10 +5330,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5514,10 +5366,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5551,10 +5402,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5588,10 +5438,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5625,10 +5474,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5662,10 +5510,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5699,10 +5546,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5736,10 +5582,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5773,10 +5618,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5810,10 +5654,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5847,10 +5690,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5884,10 +5726,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5921,10 +5762,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5958,10 +5798,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5995,10 +5834,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6032,10 +5870,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6069,10 +5906,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6106,10 +5942,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6143,10 +5978,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6180,10 +6014,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6217,10 +6050,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6254,10 +6086,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6291,10 +6122,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6328,10 +6158,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6365,10 +6194,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6402,10 +6230,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6439,10 +6266,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6476,10 +6302,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6513,10 +6338,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6550,10 +6374,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6587,10 +6410,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6624,10 +6446,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6661,10 +6482,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6698,10 +6518,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6735,10 +6554,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6772,10 +6590,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6809,10 +6626,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6846,10 +6662,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6883,10 +6698,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6920,10 +6734,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6957,10 +6770,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6994,10 +6806,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7031,10 +6842,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7068,10 +6878,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7105,10 +6914,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7142,10 +6950,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7179,10 +6986,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7216,10 +7022,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7253,10 +7058,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7290,10 +7094,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7327,10 +7130,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7364,10 +7166,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7401,10 +7202,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7438,10 +7238,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7475,10 +7274,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7512,10 +7310,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7549,10 +7346,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7586,10 +7382,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7623,10 +7418,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7660,10 +7454,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7697,10 +7490,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7734,10 +7526,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7771,10 +7562,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7808,10 +7598,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7845,10 +7634,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7882,10 +7670,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7919,10 +7706,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7956,10 +7742,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -7993,10 +7778,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8030,10 +7814,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8067,10 +7850,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8104,10 +7886,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8141,10 +7922,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8178,10 +7958,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8215,10 +7994,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8252,10 +8030,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8289,10 +8066,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8326,10 +8102,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8363,10 +8138,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8400,10 +8174,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8437,10 +8210,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8474,10 +8246,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8511,10 +8282,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8548,10 +8318,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8585,10 +8354,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8622,10 +8390,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8659,10 +8426,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8696,10 +8462,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8733,10 +8498,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8770,10 +8534,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8807,10 +8570,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8844,10 +8606,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8881,10 +8642,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8918,10 +8678,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8955,10 +8714,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -8992,10 +8750,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9029,10 +8786,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9066,10 +8822,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9103,10 +8858,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9140,10 +8894,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9177,10 +8930,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9214,10 +8966,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9251,10 +9002,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9288,10 +9038,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9325,10 +9074,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9362,10 +9110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9399,10 +9146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9436,10 +9182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9473,10 +9218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9510,10 +9254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9547,10 +9290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9584,10 +9326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9621,10 +9362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9658,10 +9398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9695,10 +9434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9732,10 +9470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9769,10 +9506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9806,10 +9542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9843,10 +9578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9880,10 +9614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9917,10 +9650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9954,10 +9686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -9991,10 +9722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10028,10 +9758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10065,10 +9794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10102,10 +9830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10139,10 +9866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10176,10 +9902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10213,10 +9938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10250,10 +9974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10287,10 +10010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10324,10 +10046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10361,10 +10082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10398,10 +10118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10435,10 +10154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10472,10 +10190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10509,10 +10226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10546,10 +10262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10583,10 +10298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10620,10 +10334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10657,10 +10370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10694,10 +10406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10731,10 +10442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10768,10 +10478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10805,10 +10514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10842,10 +10550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10879,10 +10586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10916,10 +10622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10953,10 +10658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -10990,10 +10694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11027,10 +10730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11064,10 +10766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11101,10 +10802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11138,10 +10838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11175,10 +10874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11212,10 +10910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11249,10 +10946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11286,10 +10982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11323,10 +11018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11360,10 +11054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11397,10 +11090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11434,10 +11126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11471,10 +11162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11508,10 +11198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11545,10 +11234,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11582,10 +11270,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11619,10 +11306,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11656,10 +11342,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11693,10 +11378,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11730,10 +11414,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11767,10 +11450,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11804,10 +11486,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11841,10 +11522,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11878,10 +11558,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11915,10 +11594,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11952,10 +11630,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -11989,10 +11666,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12026,10 +11702,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12063,10 +11738,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12100,10 +11774,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12137,10 +11810,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12174,10 +11846,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12211,10 +11882,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12248,10 +11918,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12285,10 +11954,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12322,10 +11990,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12359,10 +12026,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12396,10 +12062,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12433,10 +12098,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12470,10 +12134,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12507,10 +12170,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12544,10 +12206,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12581,10 +12242,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12618,10 +12278,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12655,10 +12314,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12692,10 +12350,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12729,10 +12386,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12766,10 +12422,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12803,10 +12458,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12840,10 +12494,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12877,10 +12530,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12914,10 +12566,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12951,10 +12602,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -12988,10 +12638,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13025,10 +12674,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13062,10 +12710,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13099,10 +12746,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13136,10 +12782,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13173,10 +12818,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13210,10 +12854,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13247,10 +12890,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13284,10 +12926,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13321,10 +12962,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13358,10 +12998,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13395,10 +13034,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13432,10 +13070,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13469,10 +13106,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13506,10 +13142,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13543,10 +13178,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13580,10 +13214,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13617,10 +13250,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13654,10 +13286,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13691,10 +13322,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13728,10 +13358,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13765,10 +13394,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13802,10 +13430,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13839,10 +13466,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13876,10 +13502,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13913,10 +13538,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13950,10 +13574,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -13987,10 +13610,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14024,10 +13646,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14061,10 +13682,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14098,10 +13718,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14135,10 +13754,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14172,10 +13790,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14209,10 +13826,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14246,10 +13862,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14283,10 +13898,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14320,10 +13934,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14357,10 +13970,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14394,10 +14006,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14431,10 +14042,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14468,10 +14078,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14505,10 +14114,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14542,10 +14150,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14579,10 +14186,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14616,10 +14222,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14653,10 +14258,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14690,10 +14294,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14727,10 +14330,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14764,10 +14366,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14801,10 +14402,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14838,10 +14438,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14875,10 +14474,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14912,10 +14510,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14949,10 +14546,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -14986,10 +14582,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15023,10 +14618,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15060,10 +14654,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15097,10 +14690,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15134,10 +14726,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15171,10 +14762,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15208,10 +14798,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15245,10 +14834,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15282,10 +14870,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15319,10 +14906,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15356,10 +14942,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15393,10 +14978,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15430,10 +15014,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15467,10 +15050,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15504,10 +15086,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15541,10 +15122,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15578,10 +15158,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15615,10 +15194,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15652,10 +15230,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15689,10 +15266,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15726,10 +15302,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15763,10 +15338,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15800,10 +15374,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15836,11 +15409,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15874,10 +15445,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15911,10 +15481,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15948,10 +15517,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -15985,10 +15553,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16022,10 +15589,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16059,10 +15625,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16096,10 +15661,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16133,10 +15697,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16170,10 +15733,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16207,10 +15769,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16244,10 +15805,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16281,10 +15841,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16318,10 +15877,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16355,10 +15913,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16392,10 +15949,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16429,10 +15985,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16466,10 +16021,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16503,10 +16057,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16540,10 +16093,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16577,10 +16129,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16614,10 +16165,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16651,10 +16201,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16688,10 +16237,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16725,10 +16273,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16762,10 +16309,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16799,10 +16345,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16836,10 +16381,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16873,10 +16417,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16910,10 +16453,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16947,10 +16489,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -16984,10 +16525,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17021,10 +16561,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17058,10 +16597,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17095,10 +16633,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17132,10 +16669,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17169,10 +16705,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17206,10 +16741,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17243,10 +16777,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17280,10 +16813,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17317,10 +16849,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17354,10 +16885,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17391,10 +16921,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17428,10 +16957,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17465,10 +16993,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17502,10 +17029,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17539,10 +17065,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17576,10 +17101,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17613,10 +17137,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17650,10 +17173,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17687,10 +17209,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17724,10 +17245,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17761,10 +17281,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17798,10 +17317,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17835,10 +17353,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17872,10 +17389,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17909,10 +17425,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17946,10 +17461,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -17983,10 +17497,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18020,10 +17533,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18057,10 +17569,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18094,10 +17605,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18131,10 +17641,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18168,10 +17677,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18205,10 +17713,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18242,10 +17749,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18279,10 +17785,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18316,10 +17821,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18353,10 +17857,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18390,10 +17893,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18427,10 +17929,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18464,10 +17965,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18501,10 +18001,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18538,10 +18037,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18575,10 +18073,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18612,10 +18109,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18649,10 +18145,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18686,10 +18181,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18723,10 +18217,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18760,10 +18253,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18797,10 +18289,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18834,10 +18325,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18871,10 +18361,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18908,10 +18397,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18945,10 +18433,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -18982,10 +18469,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19019,10 +18505,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19056,10 +18541,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19093,10 +18577,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19130,10 +18613,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19167,10 +18649,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19204,10 +18685,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19241,10 +18721,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19278,10 +18757,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19315,10 +18793,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19352,10 +18829,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19389,10 +18865,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19426,10 +18901,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19463,10 +18937,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19500,10 +18973,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19537,10 +19009,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19574,10 +19045,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19611,10 +19081,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19648,10 +19117,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19685,10 +19153,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19722,10 +19189,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19759,10 +19225,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19796,10 +19261,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19833,10 +19297,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19870,10 +19333,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19907,10 +19369,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19944,10 +19405,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -19981,10 +19441,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20018,10 +19477,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20055,10 +19513,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20092,10 +19549,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20129,10 +19585,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20166,10 +19621,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20203,10 +19657,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20240,10 +19693,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20277,10 +19729,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20314,10 +19765,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20351,10 +19801,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20388,10 +19837,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20425,10 +19873,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20462,10 +19909,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20499,10 +19945,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20536,10 +19981,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20573,10 +20017,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20610,10 +20053,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20647,10 +20089,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20684,10 +20125,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20721,10 +20161,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20758,10 +20197,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20795,10 +20233,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20832,10 +20269,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20869,10 +20305,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20906,10 +20341,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20943,10 +20377,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -20980,10 +20413,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21017,10 +20449,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21054,10 +20485,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21091,10 +20521,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21128,10 +20557,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21165,10 +20593,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21202,10 +20629,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21239,10 +20665,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21276,10 +20701,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21313,10 +20737,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21350,10 +20773,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21387,10 +20809,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21424,10 +20845,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21461,10 +20881,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21498,10 +20917,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21535,10 +20953,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21572,10 +20989,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21609,10 +21025,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21646,10 +21061,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21683,10 +21097,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21720,10 +21133,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21757,10 +21169,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21794,10 +21205,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21831,10 +21241,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21868,10 +21277,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21905,10 +21313,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21942,10 +21349,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -21979,10 +21385,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22016,10 +21421,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22053,10 +21457,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22090,10 +21493,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22127,10 +21529,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22164,10 +21565,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22201,10 +21601,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22238,10 +21637,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22275,10 +21673,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22312,10 +21709,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22349,10 +21745,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22386,10 +21781,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22423,10 +21817,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22460,10 +21853,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22497,10 +21889,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22534,10 +21925,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22571,10 +21961,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22608,10 +21997,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22645,10 +22033,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22682,10 +22069,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22719,10 +22105,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22756,10 +22141,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22793,10 +22177,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22830,10 +22213,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22867,10 +22249,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22904,10 +22285,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22941,10 +22321,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -22978,10 +22357,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23015,10 +22393,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23052,10 +22429,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23089,10 +22465,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23126,10 +22501,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23163,10 +22537,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23200,10 +22573,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23237,10 +22609,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23274,10 +22645,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23311,10 +22681,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23348,10 +22717,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23385,10 +22753,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23422,10 +22789,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23459,10 +22825,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23496,10 +22861,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23533,10 +22897,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23570,10 +22933,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23607,10 +22969,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23644,10 +23005,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23681,10 +23041,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23718,10 +23077,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23755,10 +23113,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23792,10 +23149,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23829,10 +23185,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23866,10 +23221,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23903,10 +23257,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23940,10 +23293,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -23977,10 +23329,9 @@ String xpath = "$var castable as xs:QName"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExprInstanceOfTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExprInstanceOfTest.java index fac0e19..3d5f7a6 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExprInstanceOfTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqExprInstanceOfTest.java
@@ -39,10 +39,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -76,10 +75,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -113,10 +111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -150,10 +147,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -187,10 +183,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -224,10 +219,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -261,10 +255,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -298,10 +291,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -335,10 +327,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -372,10 +363,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -409,10 +399,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -446,10 +435,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -483,10 +471,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -520,10 +507,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -557,10 +543,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -594,10 +579,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -631,10 +615,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -668,10 +651,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -705,10 +687,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -742,10 +723,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -779,10 +759,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -816,10 +795,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -853,10 +831,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -890,10 +867,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -927,10 +903,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -964,10 +939,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1001,10 +975,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1038,10 +1011,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1075,10 +1047,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1112,10 +1083,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1149,10 +1119,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1186,10 +1155,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1223,10 +1191,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1260,10 +1227,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1297,10 +1263,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1334,10 +1299,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1371,10 +1335,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1408,10 +1371,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1445,10 +1407,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1482,10 +1443,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1519,10 +1479,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1556,10 +1515,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1593,10 +1551,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1630,10 +1587,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1667,10 +1623,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1704,10 +1659,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1741,10 +1695,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1778,10 +1731,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1815,10 +1767,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1852,10 +1803,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1889,10 +1839,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1926,10 +1875,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1963,10 +1911,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2000,10 +1947,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2037,10 +1983,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2074,10 +2019,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2111,10 +2055,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2148,10 +2091,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2185,10 +2127,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2222,10 +2163,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2259,10 +2199,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2296,10 +2235,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2333,10 +2271,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2370,10 +2307,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2407,10 +2343,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2444,10 +2379,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2481,10 +2415,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2518,10 +2451,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2555,10 +2487,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2592,10 +2523,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2629,10 +2559,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2666,10 +2595,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2703,10 +2631,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2740,10 +2667,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2777,10 +2703,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2814,10 +2739,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2851,10 +2775,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2888,10 +2811,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2925,10 +2847,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2962,10 +2883,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2999,10 +2919,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3036,10 +2955,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3073,10 +2991,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3110,10 +3027,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3147,10 +3063,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3184,10 +3099,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3221,10 +3135,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3258,10 +3171,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3295,10 +3207,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3332,10 +3243,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3369,10 +3279,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3406,10 +3315,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3443,10 +3351,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3480,10 +3387,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3517,10 +3423,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3554,10 +3459,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3591,10 +3495,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3628,10 +3531,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3665,10 +3567,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3702,10 +3603,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3739,10 +3639,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3776,10 +3675,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3813,10 +3711,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3850,10 +3747,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3887,10 +3783,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3924,10 +3819,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3961,10 +3855,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3998,10 +3891,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4035,10 +3927,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4072,10 +3963,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4109,10 +3999,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4147,10 +4036,9 @@ xpath = "1 instance of item((:comment:))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4184,10 +4072,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4221,10 +4108,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4258,10 +4144,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4295,10 +4180,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4332,10 +4216,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4369,10 +4252,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4406,10 +4288,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4443,10 +4324,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4480,10 +4360,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4517,10 +4396,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4554,10 +4432,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4591,10 +4468,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4628,10 +4504,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4665,10 +4540,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4702,10 +4576,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4739,10 +4612,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4776,10 +4648,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4813,10 +4684,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4850,10 +4720,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4887,10 +4756,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4924,10 +4792,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4961,10 +4828,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4998,10 +4864,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5035,10 +4900,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5072,10 +4936,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5109,10 +4972,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5146,10 +5008,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5183,10 +5044,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5220,10 +5080,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5257,10 +5116,9 @@ String xpath = "not(1 instance of text((:comment:)))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5294,10 +5152,9 @@ String xpath = "not(1 instance of node((:comment:)))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5331,10 +5188,9 @@ String xpath = "not(1 instance of element((:comment:)))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5368,10 +5224,9 @@ String xpath = "not(1 instance of processing-instruction((:comment:)))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5406,10 +5261,9 @@ String xpath = "not(1 instance of comment((:comment:)))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5443,10 +5297,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5480,10 +5333,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5517,10 +5369,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5554,10 +5405,9 @@ String xpath = "() instance of empty-sequence((:comment:))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5591,10 +5441,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5629,10 +5478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5666,10 +5514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5703,10 +5550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5740,10 +5586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5777,10 +5622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5814,10 +5658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5851,10 +5694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5887,10 +5729,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5923,10 +5764,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5959,10 +5799,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5995,10 +5834,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6031,10 +5869,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6067,10 +5904,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6103,10 +5939,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6139,10 +5974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6175,10 +6009,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6211,10 +6044,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6247,10 +6079,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6283,10 +6114,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6319,10 +6149,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6355,10 +6184,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6391,10 +6219,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6428,10 +6255,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6465,10 +6291,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6502,10 +6327,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqIntersectTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqIntersectTest.java index 9b7b4a2..753eab0 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqIntersectTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqIntersectTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -552,14 +538,13 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -589,14 +574,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -630,10 +615,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +651,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +687,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +723,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +759,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +795,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqUnionTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqUnionTest.java index d59b5c3..2c064da 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqUnionTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SeqUnionTest.java
@@ -39,10 +39,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -76,10 +75,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -113,10 +111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -150,10 +147,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -187,10 +183,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -224,10 +219,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -261,10 +255,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -298,10 +291,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -335,10 +327,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -372,10 +363,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -409,10 +399,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -446,10 +435,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -483,10 +471,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -520,10 +507,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -553,15 +539,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -593,15 +578,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -633,15 +617,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -673,15 +656,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -711,15 +693,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -749,15 +730,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -787,15 +767,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -825,15 +804,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SequenceTypeSyntaxTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SequenceTypeSyntaxTest.java index c9619ee..3d26bce 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SequenceTypeSyntaxTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/SequenceTypeSyntaxTest.java
@@ -44,10 +44,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -80,10 +79,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -116,10 +114,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -152,10 +149,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -188,10 +184,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -224,10 +219,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -296,10 +289,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -332,10 +324,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -368,10 +359,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -404,10 +394,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -440,10 +429,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -476,10 +464,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -512,10 +499,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -548,10 +534,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -584,10 +569,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -620,10 +604,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -656,10 +639,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -692,10 +674,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -728,10 +709,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first(); @@ -764,10 +744,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + AnyType result = rs.first();
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/UnabbrAxesTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/UnabbrAxesTest.java index 4f3553f..0fbaba0 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/UnabbrAxesTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/UnabbrAxesTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -222,10 +217,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -259,10 +253,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -296,10 +289,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -333,10 +325,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -370,10 +361,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -407,10 +397,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -444,10 +433,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -481,10 +469,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -518,10 +505,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -555,10 +541,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -592,10 +577,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -629,10 +613,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -666,10 +649,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -703,10 +685,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -740,10 +721,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -777,10 +757,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -814,10 +793,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -851,10 +829,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -887,10 +864,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -924,10 +900,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -961,10 +936,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/XQueryCommentTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/XQueryCommentTest.java index 8561f69..1833048 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/XQueryCommentTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/XQueryCommentTest.java
@@ -35,15 +35,14 @@ DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("fsm", "http://www.example.com/filesystem"); + addNamespace("fsm", "http://www.example.com/filesystem"); String xpath = "(: comment :)\n($input-context//fsm:Folder)[1]/fsm:File[1]/fsm:FileName"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -74,17 +73,16 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("fsm", "http://www.example.com/filesystem"); + addNamespace("fsm", "http://www.example.com/filesystem"); String xpath = "if (:test (: yada (: neato :) :) :) ($input-context/fsm:MyComputer)\n" + "then (: yada :) \"true\"\n" + " else \"false\""; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -114,15 +112,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("fsm", "http://www.example.com/filesystem"); + addNamespace("fsm", "http://www.example.com/filesystem"); String xpath = "if (:test:)(:t2:)(:t3:) ($input-context/fsm:MyComputer) then \"true\" else \"false\""; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -156,10 +153,9 @@ String xpath = "$input-context/south(: comment :)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -193,10 +189,9 @@ String xpath = "(1, 2, (: comment :) 3, 4)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -230,10 +225,9 @@ String xpath = "\"10\" cast as (: type comment :) xs:integer ?"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -266,10 +260,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -302,10 +295,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -338,10 +330,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -374,10 +365,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -410,10 +400,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/commaOpTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/commaOpTest.java index 45d011a..e955749 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/commaOpTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/core/commaOpTest.java
@@ -37,10 +37,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -74,10 +73,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -111,10 +109,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -148,10 +145,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -185,10 +181,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -222,10 +217,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -259,10 +253,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -296,10 +289,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -336,10 +328,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -373,10 +364,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -410,10 +400,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -447,10 +436,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -484,10 +472,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -521,10 +508,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -558,10 +544,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -595,10 +580,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -632,10 +616,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -669,10 +652,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -706,10 +688,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -743,10 +724,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -780,10 +760,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -817,10 +796,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -854,10 +832,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -891,10 +868,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -928,10 +904,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -965,10 +940,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1002,10 +976,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1039,10 +1012,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1076,10 +1048,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1113,10 +1084,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1150,10 +1120,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1187,10 +1156,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1224,10 +1192,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1261,10 +1228,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1298,10 +1264,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1335,10 +1300,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1372,10 +1336,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1409,10 +1372,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1446,10 +1408,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1483,10 +1444,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1520,10 +1480,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1557,10 +1516,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1594,10 +1552,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1631,10 +1588,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1668,10 +1624,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1705,10 +1660,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1742,10 +1696,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1779,10 +1732,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1816,10 +1768,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1853,10 +1804,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); // Iterator<NodeType> iterator = rs.iterator(); @@ -1898,10 +1848,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateAddDTDTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateAddDTDTest.java index 9344a53..a51b562 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateAddDTDTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateAddDTDTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateAddYMDTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateAddYMDTest.java index 26b7802..a7387fa 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateAddYMDTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateAddYMDTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateEQTest.java index 65c0e42..1eb8f3b 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateEdgeCasesTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateEdgeCasesTest.java index a7e5912..ddb1bd2 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateEdgeCasesTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateEdgeCasesTest.java
@@ -37,10 +37,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -113,10 +111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -151,10 +148,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -191,10 +187,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -231,10 +226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -268,10 +262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateGTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateGTTest.java index 6f1d002..98ddef5 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateGTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateGTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateLTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateLTTest.java index 12d8d13..6daabac 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateLTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateLTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -446,10 +435,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -483,10 +471,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -520,10 +507,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -557,10 +543,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -594,10 +579,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -631,10 +615,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -668,10 +651,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -705,10 +687,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -742,10 +723,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -779,10 +759,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -816,10 +795,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -853,10 +831,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -890,10 +867,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateSubtractDTDTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateSubtractDTDTest.java index 657b591..51565ef 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateSubtractDTDTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateSubtractDTDTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateSubtractYMDTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateSubtractYMDTest.java index e8b9c65..59f31ef 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateSubtractYMDTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateSubtractYMDTest.java
@@ -28,10 +28,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -65,10 +64,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -102,10 +100,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -139,10 +136,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -176,10 +172,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -213,10 +208,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -250,10 +244,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -287,10 +280,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -324,10 +316,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -361,10 +352,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -398,10 +388,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -435,10 +424,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -472,10 +460,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -509,10 +496,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -546,10 +532,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -583,10 +568,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -620,10 +604,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -657,10 +640,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -694,10 +676,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -731,10 +712,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -768,10 +748,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -805,10 +784,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeAddDTDTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeAddDTDTest.java index 9af8a67..1fc9302 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeAddDTDTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeAddDTDTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeEQTest.java index e6ee557..79363eb 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeGTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeGTTest.java index bd4b9c1..211edbc 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeGTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeGTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeLTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeLTTest.java index fb0da9f..3920588 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeLTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeLTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeSubtractDTDTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeSubtractDTDTest.java index a7593a4..a3be1ab 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeSubtractDTDTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeSubtractDTDTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeSubtractYMDTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeSubtractYMDTest.java index 727bf80..3f0fb31 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeSubtractYMDTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DateTimeSubtractYMDTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DatesSubtractTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DatesSubtractTest.java index c496900..6044612 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DatesSubtractTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DatesSubtractTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -298,10 +291,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -335,10 +327,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -372,10 +363,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -409,10 +399,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -446,10 +435,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -483,10 +471,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -520,10 +507,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -557,10 +543,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -594,10 +579,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -631,10 +615,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -668,10 +651,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -705,10 +687,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationAddTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationAddTest.java index 005cc33..a45135e 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationAddTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationAddTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationDivideDTDTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationDivideDTDTest.java index accaa5d..3361f66 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationDivideDTDTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationDivideDTDTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -76,10 +75,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -113,10 +111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -150,10 +147,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -187,10 +183,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -224,10 +219,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -261,10 +255,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -298,10 +291,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -335,10 +327,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -372,10 +363,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -410,10 +400,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -447,10 +436,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -485,10 +473,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -522,10 +509,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -559,10 +545,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -596,10 +581,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -633,10 +617,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationDivideTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationDivideTest.java index 2210f08..ab1eb4d 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationDivideTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationDivideTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationGTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationGTTest.java index 7030107..2e11b6b 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationGTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationGTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationLTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationLTTest.java index acc32f0..031d972 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationLTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationLTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationMultiplyTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationMultiplyTest.java index ffdee84..df4ce62 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationMultiplyTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationMultiplyTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationSubtractTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationSubtractTest.java index 1801332..dc86de9 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationSubtractTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/DayTimeDurationSubtractTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -594,10 +579,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -631,10 +615,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -668,10 +651,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -705,10 +687,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -742,10 +723,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeAddDTDTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeAddDTDTest.java index 1272684..2d2f164 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeAddDTDTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeAddDTDTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeEQTest.java index 22e3453..50ddccb 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeGTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeGTTest.java index aac6032..ccda56a 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeGTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeGTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeLTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeLTTest.java index cb6e43a..f531673 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeLTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeLTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeSubtractDTDTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeSubtractDTDTest.java index c57c285..4f03ce1 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeSubtractDTDTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeSubtractDTDTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeSubtractTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeSubtractTest.java index da43925..eecb39f 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeSubtractTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/TimeSubtractTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationAddDTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationAddDTTest.java index b35c328..07277f2 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationAddDTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationAddDTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationAddTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationAddTest.java index ff17879..ce48301 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationAddTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationAddTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationDivideTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationDivideTest.java index 31d3512..4a4a7a3 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationDivideTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationDivideTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationDivideYMDTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationDivideYMDTest.java index 45749e1..876cd22 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationDivideYMDTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationDivideYMDTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationGTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationGTTest.java index b2a0d6f..73ae19c 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationGTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationGTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationLTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationLTTest.java index 9792225..612780c 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationLTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationLTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationMultiplyTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationMultiplyTest.java index 963b0ec..78bd7da 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationMultiplyTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationMultiplyTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -888,10 +865,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationSubtractTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationSubtractTest.java index 906518d..f599b1d 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationSubtractTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/YearMonthDurationSubtractTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/dateTimesSubtractTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/dateTimesSubtractTest.java index 5b802d1..780b8c3 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/dateTimesSubtractTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/dateTimesSubtractTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gDayEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gDayEQTest.java index 7ce7cd1..5d1defb 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gDayEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gDayEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gMonthDayEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gMonthDayEQTest.java index a84ec5c..92123aa 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gMonthDayEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gMonthDayEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gMonthEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gMonthEQTest.java index ebb52b2..f8b1cce 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gMonthEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gMonthEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gYearEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gYearEQTest.java index a749493..afe3125 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gYearEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gYearEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gYearMonthEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gYearMonthEQTest.java index d1b601f..07250e3 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gYearMonthEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/dates/gYearMonthEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ABSFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ABSFuncTest.java index 1ba9887..2fbe986 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ABSFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ABSFuncTest.java
@@ -38,10 +38,8 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); actual = buildResultString(rs); @@ -75,10 +73,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +109,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +145,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +181,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +217,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +253,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +289,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +325,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +361,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +397,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +433,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +469,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +505,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +541,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +577,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +613,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +649,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +685,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +721,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +757,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +793,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +829,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +865,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +901,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +937,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +973,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1009,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1045,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1081,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1117,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1153,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1189,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1225,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1261,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1297,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1333,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1369,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1405,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1441,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1477,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1556,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1593,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1630,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1667,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1704,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1741,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1778,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1815,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1852,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1889,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1926,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1963,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2000,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2037,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2074,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2111,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2148,10 +2090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2185,10 +2126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2222,10 +2162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2259,10 +2198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2296,10 +2234,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2333,10 +2270,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2369,10 +2305,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2406,10 +2341,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2442,10 +2376,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2478,10 +2411,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2514,10 +2446,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2550,10 +2481,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2586,10 +2516,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2622,10 +2551,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2658,10 +2586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2694,10 +2621,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2730,10 +2656,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2766,10 +2691,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2802,10 +2726,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2838,10 +2761,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2874,10 +2796,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2910,10 +2831,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2946,10 +2866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2982,10 +2901,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3018,10 +2936,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3054,10 +2971,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3090,10 +3006,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3126,10 +3041,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3162,10 +3076,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3198,10 +3111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3234,10 +3146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3270,10 +3181,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3306,10 +3216,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3342,10 +3251,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3378,10 +3286,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3414,10 +3321,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3450,10 +3356,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3486,10 +3391,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3522,10 +3426,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3558,10 +3461,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3594,10 +3496,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3630,10 +3531,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3666,10 +3566,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3702,10 +3601,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3738,10 +3636,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3774,10 +3671,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3810,10 +3706,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3846,10 +3741,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3882,10 +3776,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3918,10 +3811,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3954,10 +3846,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3990,10 +3881,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4026,10 +3916,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4062,10 +3951,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4098,10 +3986,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4134,10 +4021,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4170,10 +4056,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4206,10 +4091,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4242,10 +4126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4278,10 +4161,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4314,10 +4196,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4350,10 +4231,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4386,10 +4266,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4422,10 +4301,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4458,10 +4336,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4494,10 +4371,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4530,10 +4406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4566,10 +4441,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/AdjDateTimeToTimezoneFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/AdjDateTimeToTimezoneFuncTest.java index e9cf0e0..7b6d494 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/AdjDateTimeToTimezoneFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/AdjDateTimeToTimezoneFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -76,10 +75,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -113,10 +111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -150,10 +147,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -187,10 +183,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -224,10 +219,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -261,10 +255,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -298,10 +291,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -335,10 +327,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -372,10 +363,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -409,10 +399,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -446,10 +435,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -483,10 +471,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -520,10 +507,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -557,10 +543,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -594,10 +579,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -631,10 +615,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -668,10 +651,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -705,10 +687,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -742,10 +723,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -779,10 +759,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -816,10 +795,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -888,10 +865,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/AdjDateToTimezoneFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/AdjDateToTimezoneFuncTest.java index 9f470a8..6873c9f 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/AdjDateToTimezoneFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/AdjDateToTimezoneFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/AdjTimeToTimezoneFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/AdjTimeToTimezoneFuncTest.java index 3f1e481..2771767 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/AdjTimeToTimezoneFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/AdjTimeToTimezoneFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/BaseURIFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/BaseURIFuncTest.java index 58d591f..3a8e4f5 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/BaseURIFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/BaseURIFuncTest.java
@@ -37,12 +37,9 @@ String xpath = "fn:base-uri()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, null); // no context + compileXPath(dc, xpath); + ResultSequence rs = evaluate(null); // no context - ResultSequence rs = eval.evaluate(path); - actual = buildResultString(rs); } catch (XPathParserException ex) { @@ -75,10 +72,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -115,8 +111,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context - ResultSequence rs = eval.evaluate(path); + ResultSequence rs = evaluate(null); // no context actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/CeilingFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/CeilingFuncTest.java index df22d1a..f237d06 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/CeilingFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/CeilingFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/CodepointEqualTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/CodepointEqualTest.java index 5b9997c..a4fba51 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/CodepointEqualTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/CodepointEqualTest.java
@@ -39,10 +39,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -76,10 +75,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -113,10 +111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -150,10 +147,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -187,10 +183,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -224,10 +219,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -261,10 +255,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -298,10 +291,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -335,10 +327,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -407,10 +397,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -444,10 +433,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -481,10 +469,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -518,10 +505,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -555,10 +541,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -592,10 +577,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -629,10 +613,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -666,10 +649,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -703,10 +685,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -740,10 +721,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -777,10 +757,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/CodepointToStringFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/CodepointToStringFuncTest.java index 41f1ce8..2740ab9 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/CodepointToStringFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/CodepointToStringFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -111,10 +109,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -147,10 +144,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -183,10 +179,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -219,10 +214,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -256,10 +250,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -293,10 +286,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -330,10 +322,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -367,10 +358,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -404,10 +394,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -441,10 +430,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -478,10 +466,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -515,10 +502,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -552,10 +538,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -589,10 +574,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -626,10 +610,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -663,10 +646,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -700,10 +682,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -737,10 +718,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ConcatFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ConcatFuncTest.java index f295e1d..c81fdd8 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ConcatFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ConcatFuncTest.java
@@ -28,10 +28,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -65,10 +64,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -102,10 +100,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -139,10 +136,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -176,10 +172,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -213,10 +208,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -250,10 +244,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -287,10 +280,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -324,10 +316,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -361,10 +352,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -398,10 +388,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -435,10 +424,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -472,10 +460,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -509,10 +496,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -546,10 +532,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -583,10 +568,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -620,10 +604,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -657,10 +640,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -694,10 +676,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -731,10 +712,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -768,10 +748,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -805,10 +784,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -842,10 +820,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -879,10 +856,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -916,10 +892,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -953,10 +928,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -990,10 +964,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1027,10 +1000,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1064,10 +1036,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1101,10 +1072,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1138,10 +1108,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1175,10 +1144,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1212,10 +1180,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1249,10 +1216,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1286,10 +1252,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1323,10 +1288,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1360,10 +1324,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1397,10 +1360,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1434,10 +1396,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1471,10 +1432,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1508,10 +1468,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1545,10 +1504,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1582,10 +1540,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1619,10 +1576,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1656,10 +1612,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1693,10 +1648,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1730,10 +1684,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1767,10 +1720,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1804,10 +1756,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1841,10 +1792,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1878,10 +1828,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1915,10 +1864,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1952,10 +1900,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1989,10 +1936,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2026,10 +1972,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2063,10 +2008,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2100,10 +2044,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2137,10 +2080,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2174,10 +2116,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2211,10 +2152,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2248,10 +2188,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2285,10 +2224,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2322,10 +2260,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2359,10 +2296,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2396,10 +2332,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2433,10 +2368,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2470,10 +2404,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2507,10 +2440,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2544,10 +2476,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2581,10 +2512,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2618,10 +2548,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2655,10 +2584,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2692,10 +2620,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2729,10 +2656,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2766,10 +2692,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2803,10 +2728,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2840,10 +2764,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2877,10 +2800,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2914,10 +2836,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2951,10 +2872,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2988,10 +2908,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3025,10 +2944,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContainsFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContainsFuncTest.java index 6f419d0..c93a01c 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContainsFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContainsFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextCurrentDateFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextCurrentDateFuncTest.java index 3656c52..e4c33f1 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextCurrentDateFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextCurrentDateFuncTest.java
@@ -41,10 +41,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -78,10 +77,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -116,10 +114,9 @@ DateFormat expectedFormat = new SimpleDateFormat("MM"); try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -152,11 +149,10 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - cal = dc.current_date_time(); - ResultSequence rs = eval.evaluate(path); + cal = Calendar.getInstance(); + ResultSequence rs = evaluate(domDoc); actual = buildResultString(rs); @@ -189,10 +185,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -224,10 +219,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -333,10 +325,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -368,10 +359,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -403,10 +393,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -443,10 +432,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -480,10 +468,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -517,10 +504,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -554,10 +540,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -591,10 +576,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -628,10 +612,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -665,10 +648,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -702,10 +684,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -739,10 +720,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -774,10 +754,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextCurrentDatetimeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextCurrentDatetimeFuncTest.java index 698c3b7..ef55565 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextCurrentDatetimeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextCurrentDatetimeFuncTest.java
@@ -37,10 +37,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -78,10 +77,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -119,10 +117,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -160,10 +157,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -203,10 +199,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -281,10 +276,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -324,10 +318,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -361,10 +354,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -396,10 +388,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -437,10 +428,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -480,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -517,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -554,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -591,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -628,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -665,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -702,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -739,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -776,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -811,10 +792,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +832,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -893,10 +872,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -934,10 +912,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextCurrentTimeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextCurrentTimeFuncTest.java index 4f5fd15..8e55944 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextCurrentTimeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextCurrentTimeFuncTest.java
@@ -37,10 +37,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -77,10 +76,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -118,10 +116,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -159,10 +156,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -202,10 +198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -243,10 +238,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -284,10 +278,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -327,10 +320,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -364,10 +356,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -399,10 +390,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -440,10 +430,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -481,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -522,10 +510,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -565,10 +552,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -602,10 +588,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -639,10 +624,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -676,10 +660,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -713,10 +696,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -750,10 +732,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -787,10 +768,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextDefaultCollationFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextDefaultCollationFuncTest.java index 4312de5..2cbb638 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextDefaultCollationFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextDefaultCollationFuncTest.java
@@ -37,10 +37,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -74,10 +73,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextImplicitTimezoneFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextImplicitTimezoneFuncTest.java index e2d4704..a4c8eef 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextImplicitTimezoneFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextImplicitTimezoneFuncTest.java
@@ -37,10 +37,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -74,10 +73,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -111,10 +109,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -148,10 +145,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -185,10 +181,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -221,10 +216,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -258,10 +252,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -295,10 +288,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -332,10 +324,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -368,10 +359,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -404,10 +394,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -440,10 +429,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -477,10 +465,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -514,10 +501,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -551,10 +537,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -588,10 +573,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -625,10 +609,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -662,10 +645,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -699,10 +681,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -736,10 +717,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -773,10 +753,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -810,10 +789,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -847,10 +825,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextLastFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextLastFuncTest.java index 62a2581..633071b 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextLastFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextLastFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -76,10 +75,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context document! - - ResultSequence rs = eval.evaluate(path); - + ResultSequence rs = evaluate(null); // no context document! actual = buildResultString(rs); } catch (XPathParserException ex) { @@ -112,10 +108,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -149,10 +144,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -186,10 +180,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -223,10 +216,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +252,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +288,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -334,10 +324,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -371,10 +360,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -408,10 +396,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -445,10 +432,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -482,10 +468,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -519,10 +504,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -556,10 +540,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -593,10 +576,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -630,10 +612,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -667,10 +648,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -704,10 +684,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +720,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -778,10 +756,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -815,10 +792,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextPositionFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextPositionFuncTest.java index 62e6e89..93e9a01 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextPositionFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ContextPositionFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -76,9 +75,7 @@ String actual = null; try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context document! - - ResultSequence rs = eval.evaluate(path); + ResultSequence rs = evaluate(null); // no context document! actual = buildResultString(rs); @@ -113,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -150,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -187,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -224,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -261,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -298,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -335,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -372,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -409,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -446,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -483,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -520,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -557,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -594,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -631,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -668,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -705,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -742,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -779,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -816,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DataFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DataFuncTest.java index bcfd361..7b1c2a9 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DataFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DataFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DateTimeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DateTimeFuncTest.java index e040f10..a9defc6 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DateTimeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DateTimeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1147,10 +1117,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DayFromDateFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DayFromDateFuncTest.java index 4646995..5887693 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DayFromDateFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DayFromDateFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DayFromDateTimeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DayFromDateTimeFuncTest.java index 02a8850..24179f3 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DayFromDateTimeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DayFromDateTimeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DaysFromDurationFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DaysFromDurationFuncTest.java index e8ee55e..ee4d91b 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DaysFromDurationFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DaysFromDurationFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DocumentURIFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DocumentURIFuncTest.java index b6b84e1..8c6a1a4 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DocumentURIFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/DocumentURIFuncTest.java
@@ -41,10 +41,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -74,15 +73,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context1"), new XSAnyURI(inputFile)); + setVariable("input-context1",new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -116,10 +114,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -153,10 +150,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,15 +182,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context1"), new XSAnyURI(inputFile)); + setVariable("input-context1",new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -224,15 +219,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context1"), new XSAnyURI(inputFile)); + setVariable("input-context1", new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -262,15 +256,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context1"), new XSAnyURI(inputFile)); + setVariable("input-context1",new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -300,15 +293,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context1"), new XSAnyURI(inputFile)); + setVariable("input-context1",new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -338,15 +330,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context1"), new XSAnyURI(inputFile)); + setVariable("input-context1",new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -380,10 +371,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -417,10 +407,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/EncodeURIfuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/EncodeURIfuncTest.java index fe33d1b..0ec9030 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/EncodeURIfuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/EncodeURIfuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -222,10 +217,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -258,10 +252,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -295,10 +288,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -332,10 +324,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -369,10 +360,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -406,10 +396,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -443,10 +432,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -480,10 +468,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -517,10 +504,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -554,10 +540,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -591,10 +576,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -628,10 +612,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -665,10 +648,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -702,10 +684,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -739,10 +720,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -776,10 +756,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -813,10 +792,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -850,10 +828,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/EndsWithFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/EndsWithFuncTest.java index 00b7339..00270c4 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/EndsWithFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/EndsWithFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ErrorFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ErrorFuncTest.java index e2368ad..eb6a443 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ErrorFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ErrorFuncTest.java
@@ -37,10 +37,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -72,10 +71,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -107,10 +105,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -142,10 +139,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -177,10 +173,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -212,10 +207,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -247,10 +241,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -282,10 +275,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -317,10 +309,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -352,10 +343,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -387,10 +377,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -422,10 +411,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -457,10 +445,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -492,10 +479,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -527,10 +513,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -562,10 +547,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -597,10 +581,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -632,10 +615,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +649,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -702,10 +683,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -737,10 +717,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -772,10 +751,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -807,10 +785,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -842,10 +819,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -877,10 +853,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -912,10 +887,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/EscapeHTMLURIFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/EscapeHTMLURIFuncTest.java index 4c415b5..e79cd06 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/EscapeHTMLURIFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/EscapeHTMLURIFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -185,10 +181,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -221,10 +216,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -258,10 +252,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -295,10 +288,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -332,10 +324,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -369,10 +360,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -406,10 +396,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -443,10 +432,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -480,10 +468,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -517,10 +504,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -554,10 +540,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -591,10 +576,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -628,10 +612,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -665,10 +648,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -702,10 +684,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -739,10 +720,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -776,10 +756,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -813,10 +792,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -850,10 +828,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -887,10 +864,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -924,10 +900,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -961,10 +936,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -998,10 +972,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/FalseFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/FalseFuncTest.java index ffbdbb3..6339d8d 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/FalseFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/FalseFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/FloorFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/FloorFuncTest.java index 24a3f0a..10af9ec 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/FloorFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/FloorFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/HoursFromDateTimeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/HoursFromDateTimeFuncTest.java index 53228f9..2af01b3 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/HoursFromDateTimeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/HoursFromDateTimeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/HoursFromDurationFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/HoursFromDurationFuncTest.java index ab80f7d..7ffdeb0 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/HoursFromDurationFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/HoursFromDurationFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/HoursFromTimeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/HoursFromTimeFuncTest.java index 47a2f2b..198a7cb 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/HoursFromTimeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/HoursFromTimeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/IRIToURIfuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/IRIToURIfuncTest.java index 9fa1dfa..d9e04be 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/IRIToURIfuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/IRIToURIfuncTest.java
@@ -40,10 +40,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -77,10 +76,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -114,10 +112,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -151,10 +148,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -187,10 +183,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/InScopePrefixesFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/InScopePrefixesFuncTest.java index 5b2b93a..de75b82 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/InScopePrefixesFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/InScopePrefixesFuncTest.java
@@ -36,10 +36,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -66,13 +65,12 @@ // set up XPath default namespace in Dynamic Context DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("fsx", "http://www.example.com/filesystem"); + addNamespace("fsx", "http://www.example.com/filesystem"); String xpath = "fn:in-scope-prefixes(./fsx:MyComputer)"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); String actual = buildResultString(rs); @@ -91,13 +89,12 @@ // set up XPath default namespace in Dynamic Context DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("fsx", "http://www.example.com/filesystem"); + addNamespace("fsx", "http://www.example.com/filesystem"); String xpath = "fn:in-scope-prefixes(./fsx:MyComputer/fsx:Drive[1])"; - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); String actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/LocalNameFromQNameFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/LocalNameFromQNameFuncTest.java index b6f0dcd..507c24c 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/LocalNameFromQNameFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/LocalNameFromQNameFuncTest.java
@@ -38,10 +38,9 @@ String xpath = "fn:local-name-from-QName(())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<empty>" + buildResultString(rs) + "</empty>"; @@ -76,10 +75,9 @@ String xpath = "fn:local-name-from-QName(((),()))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<empty>" + buildResultString(rs) + "</empty>"; @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -148,10 +145,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -184,10 +180,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -220,10 +215,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -256,10 +250,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/LowerCaseFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/LowerCaseFuncTest.java index 9418364..281bfab 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/LowerCaseFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/LowerCaseFuncTest.java
@@ -28,10 +28,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -65,10 +64,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -102,10 +100,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -139,10 +136,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -176,10 +172,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -213,10 +208,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -250,10 +244,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -287,10 +280,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -324,10 +316,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -361,10 +352,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -398,10 +388,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -435,10 +424,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -472,10 +460,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -509,10 +496,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -546,10 +532,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -583,10 +568,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -620,10 +604,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -657,10 +640,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -694,10 +676,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -731,10 +712,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MatchesFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MatchesFuncTest.java index d3cdc55..728c708 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MatchesFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MatchesFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -222,10 +217,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -259,10 +253,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -296,10 +289,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -333,10 +325,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -370,10 +361,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -407,10 +397,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -444,10 +433,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -481,10 +469,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -518,10 +505,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -555,10 +541,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -592,10 +577,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -629,10 +613,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -666,10 +649,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -703,10 +685,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -740,10 +721,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -777,10 +757,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -814,10 +793,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -851,10 +829,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -888,10 +865,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -925,10 +901,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -962,10 +937,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -999,10 +973,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1036,10 +1009,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1073,10 +1045,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1110,10 +1081,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1146,10 +1116,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1183,10 +1152,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1220,10 +1188,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1257,10 +1224,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1294,10 +1260,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1331,10 +1296,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1368,10 +1332,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1405,10 +1368,9 @@ String xpath = "matches('K', '[A-Z]', 'i')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1442,10 +1404,9 @@ String xpath = "matches('K', '[a-z]', 'i')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1480,10 +1441,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1517,10 +1477,9 @@ String xpath = "matches('K', 'k', 'i')"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1554,10 +1513,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1591,10 +1549,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1628,10 +1585,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1665,10 +1621,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1702,10 +1657,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1739,10 +1693,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1776,10 +1729,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1813,10 +1765,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MinutesFromDateTimeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MinutesFromDateTimeFuncTest.java index 222b7b2..cb6a8a0 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MinutesFromDateTimeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MinutesFromDateTimeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MinutesFromDurationFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MinutesFromDurationFuncTest.java index f4089db..a3c961d 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MinutesFromDurationFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MinutesFromDurationFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MinutesFromTimeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MinutesFromTimeFuncTest.java index 9a60ebf..a27391e 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MinutesFromTimeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MinutesFromTimeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MonthFromDateFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MonthFromDateFuncTest.java index cfa5eb9..83074ba 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MonthFromDateFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MonthFromDateFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MonthFromDateTimeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MonthFromDateTimeFuncTest.java index 9d35a05..7811960 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MonthFromDateTimeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MonthFromDateTimeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MonthsFromDurationFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MonthsFromDurationFuncTest.java index 64b27b7..c6c65fc 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MonthsFromDurationFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/MonthsFromDurationFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NameFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NameFuncTest.java index 78ee47c..a995757 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NameFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NameFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -261,9 +255,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context - ResultSequence rs = eval.evaluate(path); - + ResultSequence rs = evaluate(null); // no context actual = buildResultString(rs); } catch (XPathParserException ex) { @@ -296,10 +288,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -333,10 +324,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -370,10 +360,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -407,10 +396,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -444,10 +432,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -481,10 +468,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -518,10 +504,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -555,10 +540,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -592,10 +576,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -629,10 +612,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -666,10 +648,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -703,10 +684,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -740,10 +720,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -777,9 +756,7 @@ String actual = null; try { XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, null); // no context - eval.evaluate(path); + ResultSequence rs = evaluate(null); // no context } catch (XPathParserException ex) { actual = ex.code(); } catch (StaticError ex) {
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NamespaceURIFromQNameFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NamespaceURIFromQNameFuncTest.java index 8755f87..d05c1ae 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NamespaceURIFromQNameFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NamespaceURIFromQNameFuncTest.java
@@ -38,10 +38,9 @@ String xpath = "fn:namespace-uri-from-QName(())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<empty>" + buildResultString(rs) + "</empty>"; @@ -75,10 +74,9 @@ String xpath = "fn:namespace-uri-from-QName(((),()))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<empty>" + buildResultString(rs) + "</empty>"; @@ -111,10 +109,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -147,10 +144,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -183,10 +179,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -219,10 +214,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -255,10 +249,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NilledFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NilledFuncTest.java index 6894a4c..0efc1e6 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NilledFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NilledFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeLangFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeLangFuncTest.java index 6c62398..3a57ba8 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeLangFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeLangFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -150,8 +147,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context - eval.evaluate(path); + ResultSequence rs = evaluate(null); // no context } catch (XPathParserException ex) { actual = ex.code(); @@ -183,10 +179,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -220,10 +215,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -257,10 +251,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -294,10 +287,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -331,10 +323,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -368,10 +359,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -405,10 +395,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -442,10 +431,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -479,10 +467,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -516,10 +503,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -553,10 +539,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -590,10 +575,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -627,10 +611,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -663,10 +646,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -700,10 +682,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -737,10 +718,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -774,10 +754,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -811,10 +790,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -848,10 +826,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -885,10 +862,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -923,8 +899,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context - eval.evaluate(path); + ResultSequence rs = evaluate(null); // no context // we cannot require that a context is always present } catch (XPathParserException ex) {
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeLocalNameFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeLocalNameFuncTest.java index 5df84f3..769498d 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeLocalNameFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeLocalNameFuncTest.java
@@ -39,9 +39,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); - eval.evaluate(path); - + ResultSequence rs = evaluate(null); } catch (XPathParserException ex) { actual = ex.code(); } catch (StaticError ex) { @@ -72,10 +70,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -110,8 +107,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); - eval.evaluate(path); + ResultSequence rs = evaluate(null); } catch (XPathParserException ex) { actual = ex.code();
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeNamespaceURIFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeNamespaceURIFuncTest.java index 8133133..b10b0b9 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeNamespaceURIFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeNamespaceURIFuncTest.java
@@ -39,8 +39,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context - eval.evaluate(path); + ResultSequence rs = evaluate(null); // no context } catch (XPathParserException ex) { actual = ex.code(); } catch (StaticError ex) { @@ -71,10 +70,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -108,10 +106,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -145,10 +142,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -183,8 +179,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); - eval.evaluate(path); + ResultSequence rs = evaluate(null); } catch (XPathParserException ex) { actual = ex.code();
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeNumberFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeNumberFuncTest.java index d9b2e25..5eedbf8 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeNumberFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeNumberFuncTest.java
@@ -39,10 +39,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -76,10 +75,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -113,10 +111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -150,10 +147,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -188,10 +184,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -225,10 +220,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -262,10 +256,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -299,10 +292,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -336,10 +328,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -373,10 +364,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -410,10 +400,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -447,10 +436,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -484,10 +472,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -521,10 +508,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -558,10 +544,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -595,10 +580,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -632,10 +616,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -669,10 +652,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -706,10 +688,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -743,10 +724,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -780,10 +760,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -817,10 +796,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -854,10 +832,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -891,10 +868,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -928,10 +904,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -965,10 +940,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1002,10 +976,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1039,10 +1012,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1076,10 +1048,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1113,10 +1084,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1150,10 +1120,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1187,10 +1156,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1224,10 +1192,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1261,10 +1228,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1298,10 +1264,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1335,10 +1300,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1372,10 +1336,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1409,10 +1372,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1446,10 +1408,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1483,10 +1444,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1520,10 +1480,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1557,10 +1516,8 @@ String xpath = "fn:number()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, null); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(null); actual = buildResultString(rs); @@ -1596,8 +1553,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context - ResultSequence rs = eval.evaluate(path); + ResultSequence rs = evaluate(null); // no context actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeRootFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeRootFuncTest.java index 7b44979..de8f7fa 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeRootFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NodeRootFuncTest.java
@@ -40,8 +40,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context - eval.evaluate(path); + ResultSequence rs = evaluate(null); // no context } catch (XPathParserException ex) { actual = ex.code(); @@ -73,10 +72,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -110,10 +108,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -147,10 +144,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = removeIrrelevantNamespaces(buildXMLResultString(rs)); @@ -185,8 +181,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context - eval.evaluate(path); + ResultSequence rs = evaluate(null); // no context } catch (XPathParserException ex) { actual = ex.code();
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NormalizeSpaceFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NormalizeSpaceFuncTest.java index 7965fad..f7bc509 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NormalizeSpaceFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NormalizeSpaceFuncTest.java
@@ -29,10 +29,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -66,10 +65,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -103,10 +101,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -140,10 +137,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -177,10 +173,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -214,10 +209,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -251,11 +245,7 @@ String actual = null; try { XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, null); // no context document! - Focus focus = new Focus(ResultSequenceFactory.create_new()); - dc.set_focus(focus); - ResultSequence rs = eval.evaluate(path); + ResultSequence rs = evaluate(null); // no context document! actual = buildResultString(rs); @@ -289,10 +279,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -326,10 +315,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -363,10 +351,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -400,10 +387,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -437,10 +423,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -474,10 +459,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -511,10 +495,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -548,10 +531,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -585,10 +567,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -622,10 +603,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -659,10 +639,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -696,10 +675,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -733,10 +711,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -770,10 +747,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -807,10 +783,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -844,10 +819,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -881,10 +855,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -918,10 +891,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -955,10 +927,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NormalizeUnicodeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NormalizeUnicodeFuncTest.java index a810826..dedfaba 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NormalizeUnicodeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NormalizeUnicodeFuncTest.java
@@ -40,10 +40,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -77,10 +76,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -114,10 +112,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -151,10 +148,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -188,10 +184,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -225,10 +220,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -261,10 +255,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -481,10 +469,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -517,10 +504,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -554,10 +540,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -590,10 +575,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -627,10 +611,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -664,10 +647,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -701,10 +683,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -738,10 +719,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -775,10 +755,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NotFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NotFuncTest.java index b62290e..4ccf0a8 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NotFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/NotFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2036,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2073,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2110,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2147,10 +2090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2184,10 +2126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2221,10 +2162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ReplaceFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ReplaceFuncTest.java index d384f1f..4c2f775 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ReplaceFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ReplaceFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -296,10 +289,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -332,10 +324,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -368,10 +359,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -405,10 +395,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -442,10 +431,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -479,10 +467,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -516,10 +503,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -553,10 +539,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -589,10 +574,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -626,10 +610,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -663,10 +646,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -700,10 +682,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -737,10 +718,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -774,10 +754,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -811,10 +790,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -848,10 +826,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -885,10 +862,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -922,10 +898,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -959,10 +934,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -996,10 +970,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1033,10 +1006,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1070,10 +1042,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1107,10 +1078,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1144,10 +1114,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1181,10 +1150,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1218,10 +1186,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1255,10 +1222,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1292,10 +1258,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1329,10 +1294,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1404,10 +1368,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1441,10 +1404,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1478,10 +1440,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1515,10 +1476,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1552,10 +1512,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1589,10 +1548,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ResolveQNameFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ResolveQNameFuncTest.java index e7f87e4..a990479 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ResolveQNameFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ResolveQNameFuncTest.java
@@ -41,10 +41,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -76,10 +75,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -111,10 +109,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -141,17 +138,16 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("cm", "http://www.example.com"); - dc.add_namespace("ed", "http://www.example.edu"); + addNamespace("cm", "http://www.example.com"); + addNamespace("ed", "http://www.example.edu"); String xpath = "fn:string(fn:local-name-from-QName(fn:resolve-QName(\"cm:c\", /a/b/cm:c)))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -178,17 +174,16 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("cm", "http://www.example.com"); - dc.add_namespace("ed", "http://www.example.edu"); + addNamespace("cm", "http://www.example.com"); + addNamespace("ed", "http://www.example.edu"); String xpath = "fn:string(fn:namespace-uri-from-QName(fn:resolve-QName(\"cm:c\", /a/b/cm:c)))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -215,17 +210,16 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("cm", "http://www.example.com"); - dc.add_namespace("ed", "http://www.example.edu"); + addNamespace("cm", "http://www.example.com"); + addNamespace("ed", "http://www.example.edu"); String xpath = "fn:string(fn:local-name-from-QName(fn:resolve-QName(\"ed:c\", /a/b/ed:c)))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -252,17 +246,16 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("cm", "http://www.example.com"); - dc.add_namespace("ed", "http://www.example.edu"); + addNamespace("cm", "http://www.example.com"); + addNamespace("ed", "http://www.example.edu"); String xpath = "fn:string(fn:local-name-from-QName(fn:resolve-QName(\"c\", /a/b/cm:c)))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -289,16 +282,15 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace(null, "http://www.w3.org/XQueryTest/someExamples"); + addNamespace(null, "http://www.w3.org/XQueryTest/someExamples"); String xpath = "fn:string(fn:namespace-uri-from-QName(fn:resolve-QName(\"E6-Root\", /E6-Root)))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -330,10 +322,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -365,10 +356,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -400,10 +390,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -435,10 +424,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ResolveURIFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ResolveURIFuncTest.java index c6c6f41..50ab979 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ResolveURIFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/ResolveURIFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -71,15 +70,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_base_uri("http://www.example/"); + setBaseUri("http://www.example/"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -148,10 +145,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -185,10 +181,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -222,10 +217,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -259,10 +253,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -296,10 +289,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -333,10 +325,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -370,10 +361,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -407,10 +397,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -444,10 +433,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -481,10 +469,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -518,10 +505,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -555,10 +541,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -592,10 +577,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -629,10 +613,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -666,10 +649,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -703,10 +685,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -740,10 +721,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -777,10 +757,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -814,10 +793,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -851,10 +829,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/RoundEvenFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/RoundEvenFuncTest.java index 4809343..b2fb0b8 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/RoundEvenFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/RoundEvenFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/RoundFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/RoundFuncTest.java index 97509d2..f1c477c 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/RoundFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/RoundFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SecondsFromDateTimeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SecondsFromDateTimeFuncTest.java index 2301b2a..59d2030 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SecondsFromDateTimeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SecondsFromDateTimeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SecondsFromDurationFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SecondsFromDurationFuncTest.java index 4ff7690..9bfbdab 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SecondsFromDurationFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SecondsFromDurationFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SecondsFromTimeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SecondsFromTimeFuncTest.java index 9c9f514..786ad5c 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SecondsFromTimeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SecondsFromTimeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqAVGFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqAVGFuncTest.java index 47a0620..217b001 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqAVGFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqAVGFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -853,10 +831,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -890,10 +867,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -927,10 +903,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -964,10 +939,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1001,10 +975,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1038,10 +1011,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1075,10 +1047,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1112,10 +1083,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1149,10 +1119,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1186,10 +1155,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1223,10 +1191,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1260,10 +1227,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1297,10 +1263,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1334,10 +1299,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1371,10 +1335,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1408,10 +1371,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1445,10 +1407,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1482,10 +1443,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1519,10 +1479,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1556,10 +1515,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1593,10 +1551,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1630,10 +1587,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1667,10 +1623,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1704,10 +1659,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1741,10 +1695,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1778,10 +1731,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1815,10 +1767,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1852,10 +1803,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1889,10 +1839,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1926,10 +1875,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1963,10 +1911,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2000,10 +1947,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2037,10 +1983,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2074,10 +2019,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2111,10 +2055,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2148,10 +2091,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2185,10 +2127,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2222,10 +2163,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2259,10 +2199,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2296,10 +2235,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2333,10 +2271,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2370,10 +2307,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2407,10 +2343,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2444,10 +2379,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2481,10 +2415,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2518,10 +2451,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2555,10 +2487,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2592,10 +2523,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2629,10 +2559,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2666,10 +2595,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2703,10 +2631,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2740,10 +2667,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2777,10 +2703,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2814,10 +2739,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2851,10 +2775,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2888,10 +2811,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2925,10 +2847,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2962,10 +2883,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2999,10 +2919,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3036,10 +2955,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3073,10 +2991,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3110,10 +3027,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3147,10 +3063,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3184,10 +3099,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3221,10 +3135,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3258,10 +3171,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3295,10 +3207,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3332,10 +3243,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3369,10 +3279,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3406,10 +3315,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3443,10 +3351,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3480,10 +3387,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3517,10 +3423,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3554,10 +3459,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3591,10 +3495,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3628,10 +3531,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3665,10 +3567,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3702,10 +3603,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3739,10 +3639,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3776,10 +3675,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3813,10 +3711,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3850,10 +3747,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3886,10 +3782,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3923,10 +3818,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3960,10 +3854,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3997,10 +3890,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4034,10 +3926,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4071,10 +3962,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4108,10 +3998,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4147,10 +4036,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4184,10 +4072,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4221,10 +4108,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4258,10 +4144,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4295,10 +4180,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4332,10 +4216,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4369,10 +4252,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4406,10 +4288,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4443,10 +4324,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4480,10 +4360,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4517,10 +4396,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4554,10 +4432,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4591,10 +4468,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4628,10 +4504,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4665,10 +4540,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4702,10 +4576,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4739,10 +4612,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4776,10 +4648,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4813,10 +4684,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4850,10 +4720,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4887,10 +4756,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4924,10 +4792,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4960,10 +4827,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4996,10 +4862,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5032,10 +4897,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5068,10 +4932,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5104,10 +4967,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5140,10 +5002,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5176,10 +5037,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5212,10 +5072,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5248,10 +5107,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5284,10 +5142,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5320,10 +5177,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5356,10 +5212,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5392,10 +5247,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5428,10 +5282,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5464,10 +5317,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5500,10 +5352,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5536,10 +5387,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5572,10 +5422,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5608,10 +5457,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5644,10 +5492,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5680,10 +5527,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5716,10 +5562,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5752,10 +5597,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5788,10 +5632,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5824,10 +5667,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5860,10 +5702,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5896,10 +5737,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5932,10 +5772,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5968,10 +5807,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6004,10 +5842,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6040,10 +5877,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6076,10 +5912,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6112,10 +5947,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6148,10 +5982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6184,10 +6017,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6220,10 +6052,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6256,10 +6087,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6292,10 +6122,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6328,10 +6157,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqBooleanFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqBooleanFuncTest.java index 2043312..58a61c4 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqBooleanFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqBooleanFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = "fn:boolean(())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1518,10 +1478,9 @@ String xpath = "fn:boolean(\"\")"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1555,10 +1514,9 @@ String xpath = "fn:boolean(false())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1592,10 +1550,9 @@ String xpath = "fn:boolean(true())"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1629,10 +1586,9 @@ String xpath = "fn:boolean(xs:string(\"\"))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1666,10 +1622,9 @@ String xpath = "fn:boolean(('a'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1703,10 +1658,9 @@ String xpath = "fn:boolean(xs:string('abc'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1740,10 +1694,9 @@ String xpath = "fn:boolean(0)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1777,10 +1730,9 @@ String xpath = "fn:boolean(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1814,10 +1766,9 @@ String xpath = "fn:boolean(-1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1851,10 +1802,9 @@ String xpath = "fn:boolean(xs:float('NaN'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1888,10 +1838,9 @@ String xpath = "fn:boolean(xs:float('-INF'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1925,10 +1874,9 @@ String xpath = "fn:boolean(xs:float('INF'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1962,10 +1910,9 @@ String xpath = "fn:boolean(xs:float(0))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -1999,10 +1946,9 @@ String xpath = "fn:boolean(xs:float(1))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2036,10 +1982,9 @@ String xpath = "fn:boolean(xs:float(-1))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2073,10 +2018,9 @@ String xpath = "fn:boolean(xs:double('NaN'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2110,10 +2054,9 @@ String xpath = "fn:boolean(xs:double('-INF'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2147,10 +2090,9 @@ String xpath = "fn:boolean(xs:double('INF'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2184,10 +2126,9 @@ String xpath = "fn:boolean(xs:double(0))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2221,10 +2162,9 @@ String xpath = "fn:boolean(xs:double(1))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2258,10 +2198,9 @@ String xpath = "fn:boolean(xs:double('1'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2295,10 +2234,9 @@ String xpath = "fn:boolean(xs:double('NaN'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2332,10 +2270,9 @@ String xpath = "fn:boolean(xs:decimal('9.99999999999999999999999999'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2369,10 +2306,9 @@ String xpath = "fn:boolean(xs:decimal('-123456789.123456789123456789'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2406,10 +2342,9 @@ String xpath = "fn:boolean(xs:decimal('0'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2443,10 +2378,9 @@ String xpath = "fn:boolean(xs:decimal('1'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2480,10 +2414,9 @@ String xpath = "fn:boolean(xs:decimal('-1'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2517,10 +2450,9 @@ String xpath = "fn:boolean(xs:integer('0'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2554,10 +2486,9 @@ String xpath = "fn:boolean(xs:integer('1'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2591,10 +2522,9 @@ String xpath = "fn:boolean(xs:integer('-1'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2628,10 +2558,9 @@ String xpath = "fn:boolean(xs:nonPositiveInteger('-99999999999999999'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2665,10 +2594,9 @@ String xpath = "fn:boolean(xs:nonPositiveInteger('0'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2702,10 +2630,9 @@ String xpath = "fn:boolean(xs:nonPositiveInteger('-1'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2739,10 +2666,9 @@ String xpath = "fn:boolean(xs:negativeInteger('-99999999999999999'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2776,10 +2702,9 @@ String xpath = "fn:boolean(xs:negativeInteger('-1'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2813,10 +2738,9 @@ String xpath = "fn:boolean(xs:positiveInteger('99999999999999999'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2850,10 +2774,9 @@ String xpath = "fn:boolean(xs:positiveInteger('1'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2887,10 +2810,9 @@ String xpath = "fn:boolean(xs:long('9223372036854775807'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2924,10 +2846,9 @@ String xpath = "fn:boolean(xs:long('-9223372036854775808'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2961,10 +2882,9 @@ String xpath = "fn:boolean(xs:long('0'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -2998,10 +2918,9 @@ String xpath = "fn:boolean(xs:long('1'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3035,10 +2954,9 @@ String xpath = "fn:boolean(xs:long('-1'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3072,10 +2990,9 @@ String xpath = "fn:boolean(xs:int('2147483647'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3109,10 +3026,9 @@ String xpath = "fn:boolean(xs:int('-2147483648'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3146,10 +3062,9 @@ String xpath = "fn:boolean(xs:int('0'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3183,10 +3098,9 @@ String xpath = "fn:boolean(xs:int('1'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3220,10 +3134,9 @@ String xpath = "fn:boolean(xs:int('-1'))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<return>" + buildResultString(rs) + "</return>"; @@ -3257,10 +3170,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3293,10 +3205,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3332,8 +3243,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context - ResultSequence rs = eval.evaluate(path); + ResultSequence rs = evaluate(null); // no context actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqCollectionFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqCollectionFuncTest.java index 44de2d1..04dc59a 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqCollectionFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqCollectionFuncTest.java
@@ -45,10 +45,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -81,10 +80,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -117,10 +115,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -155,10 +152,9 @@ String xpath = "fn:count(fn:collection(\"" + COLLECTION1 + "\"))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -193,10 +189,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -231,10 +226,9 @@ String xpath = "fn:count(fn:collection(\"" + COLLECTION2 + "\"))"; String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -269,10 +263,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = buildResultString(rs); @@ -307,10 +300,9 @@ String xpath = "fn:collection(\"" + COLLECTION2 + "\")//*[text()[contains(.,\"TCP/IP\")]]"; String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -345,10 +337,9 @@ String xpath = "for $d in fn:collection(\"" + COLLECTION1 + "\") return ($d//title)[1]"; String actual = null; try { - XPath path = compileXPath(dc, xpath); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -377,7 +368,7 @@ HashMap map = new HashMap(); map.put(FnCollection.DEFAULT_COLLECTION_URI, arraylist); map.put(COLLECTION1, arraylist); - dc.set_collections(map); + setCollections(map); } private void loadCollection2Default(DynamicContext dc) throws Exception { @@ -395,7 +386,7 @@ HashMap map = new HashMap(); map.put(FnCollection.DEFAULT_COLLECTION_URI, arraylist); map.put(COLLECTION2, arraylist); - dc.set_collections(map); + setCollections(map); } }
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqCountFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqCountFuncTest.java index b554085..6e98776 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqCountFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqCountFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqDeepEqualFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqDeepEqualFuncTest.java index 50fb081..9507ba8 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqDeepEqualFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqDeepEqualFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2036,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2073,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2110,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2147,10 +2090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2184,10 +2126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2221,10 +2162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2258,10 +2198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2295,10 +2234,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2332,10 +2270,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2369,10 +2306,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2406,10 +2342,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2443,10 +2378,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2480,10 +2414,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2517,10 +2450,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2554,10 +2486,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2591,10 +2522,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2628,10 +2558,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2665,10 +2594,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2702,10 +2630,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2739,10 +2666,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2776,10 +2702,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2813,10 +2738,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2850,10 +2774,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2887,10 +2810,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2924,10 +2846,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2961,10 +2882,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2998,10 +2918,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3035,10 +2954,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3072,10 +2990,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3109,10 +3026,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3146,10 +3062,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3183,10 +3098,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3220,10 +3134,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3257,10 +3170,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3294,10 +3206,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3331,10 +3242,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3368,10 +3278,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3405,10 +3314,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3442,10 +3350,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3479,10 +3386,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3516,10 +3422,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3553,10 +3458,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqDistinctValuesFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqDistinctValuesFuncTest.java index e3441c4..2e13fca 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqDistinctValuesFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqDistinctValuesFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2036,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2073,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2110,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2147,10 +2090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2184,10 +2126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2221,10 +2162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2258,10 +2198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2295,10 +2234,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2332,10 +2270,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2369,10 +2306,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2406,10 +2342,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2443,10 +2378,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2480,10 +2414,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2517,10 +2450,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2554,10 +2486,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2591,10 +2522,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2628,10 +2558,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqDocFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqDocFuncTest.java index 8c10439..0e3a3a9 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqDocFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqDocFuncTest.java
@@ -40,10 +40,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -76,10 +75,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -182,15 +178,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context"), new XSAnyURI(inputFile)); + setVariable("input-context",new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -221,16 +216,15 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context1"), new XSAnyURI(inputFile)); - dc.set_variable(new QName("input-context2"), new XSAnyURI(inputFile2)); + setVariable("input-context1",new XSAnyURI(inputFile)); + setVariable("input-context2",new XSAnyURI(inputFile2)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,15 +254,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context"), new XSAnyURI(inputFile)); + setVariable("input-context",new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -298,15 +291,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context"), new XSAnyURI(inputFile)); + setVariable("input-context",new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -336,15 +328,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context"), new XSAnyURI(inputFile)); + setVariable("input-context",new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -377,10 +368,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -410,15 +400,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context"), new XSAnyURI(inputFile)); + setVariable("input-context",new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -448,15 +437,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context"), new XSAnyURI(inputFile)); + setVariable("input-context",new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -486,15 +474,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context"), new XSAnyURI(inputFile)); + setVariable("input-context",new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -524,15 +511,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context"), new XSAnyURI(inputFile)); + setVariable("input-context",new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -562,15 +548,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_variable(new QName("input-context"), new XSAnyURI(inputFile)); + setVariable("input-context",new XSAnyURI(inputFile)); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqExactlyOneFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqExactlyOneFuncTest.java index ac79caa..e202621 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqExactlyOneFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqExactlyOneFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1480,10 +1441,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqExistsFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqExistsFuncTest.java index 8b72762..1f63c74 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqExistsFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqExistsFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqIDFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqIDFuncTest.java index 4fed647..25d51f5 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqIDFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqIDFuncTest.java
@@ -40,9 +40,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context - ResultSequence rs = eval.evaluate(path); - + ResultSequence rs = evaluate(null); // no context actual = buildResultString(rs); } catch (XPathParserException ex) { @@ -75,10 +73,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -112,10 +109,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +145,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -186,10 +181,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -223,10 +217,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -260,10 +253,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +289,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +325,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -371,10 +361,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -408,10 +397,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +433,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -482,10 +469,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -519,10 +505,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -556,10 +541,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -593,10 +577,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -630,10 +613,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -667,10 +649,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -705,9 +686,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context - ResultSequence rs = eval.evaluate(path); - + ResultSequence rs = evaluate(null); // no context actual = buildResultString(rs); } catch (XPathParserException ex) { @@ -740,10 +719,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqIDREFFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqIDREFFuncTest.java index 23f5b22..0084028 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqIDREFFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqIDREFFuncTest.java
@@ -40,8 +40,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context - ResultSequence rs = eval.evaluate(path); + ResultSequence rs = evaluate(null); // no context actual = buildResultString(rs); @@ -77,8 +76,7 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context - ResultSequence rs = eval.evaluate(path); + ResultSequence rs = evaluate(null); // no context actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqIndexOfFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqIndexOfFuncTest.java index e8a1c6f..ba437e5 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqIndexOfFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqIndexOfFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -298,10 +291,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -335,10 +327,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -372,10 +363,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -409,10 +399,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -446,10 +435,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -483,10 +471,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -520,10 +507,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -557,10 +543,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -594,10 +579,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -631,10 +615,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -668,10 +651,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -705,10 +687,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -742,10 +723,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -779,10 +759,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqInsertBeforeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqInsertBeforeFuncTest.java index 5cfa02e..64c3e1c 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqInsertBeforeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqInsertBeforeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqMAXFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqMAXFuncTest.java index 4511854..bd97741 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqMAXFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqMAXFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2036,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2073,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2110,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2147,10 +2090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2184,10 +2126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2221,10 +2162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2258,10 +2198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2295,10 +2234,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2332,10 +2270,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2369,10 +2306,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2406,10 +2342,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2443,10 +2378,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2480,10 +2414,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2517,10 +2450,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2554,10 +2486,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2591,10 +2522,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2628,10 +2558,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2665,10 +2594,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2702,10 +2630,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2739,10 +2666,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2776,10 +2702,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2813,10 +2738,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2850,10 +2774,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2887,10 +2810,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2924,10 +2846,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2961,10 +2882,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2998,10 +2918,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3035,10 +2954,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3072,10 +2990,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3109,10 +3026,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3146,10 +3062,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3183,10 +3098,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3220,10 +3134,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3257,10 +3170,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3294,10 +3206,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3331,10 +3242,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3368,10 +3278,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3405,10 +3314,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3442,10 +3350,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3479,10 +3386,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3516,10 +3422,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3553,10 +3458,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3590,10 +3494,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3627,10 +3530,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3664,10 +3566,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3701,10 +3602,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3738,10 +3638,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3775,10 +3674,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3812,10 +3710,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3849,10 +3746,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3885,10 +3781,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3922,10 +3817,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3959,10 +3853,9 @@ String xpath = "fn:max((xs:long(20),xs:short(13))) instance of xs:integer"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqMINFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqMINFuncTest.java index a74cd78..2a8f632 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqMINFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqMINFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2036,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2073,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2110,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2147,10 +2090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2184,10 +2126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2221,10 +2162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2258,10 +2198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2295,10 +2234,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2332,10 +2270,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2369,10 +2306,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2406,10 +2342,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2443,10 +2378,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2480,10 +2414,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2517,10 +2450,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2554,10 +2486,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2591,10 +2522,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2628,10 +2558,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2665,10 +2594,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2702,10 +2630,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2739,10 +2666,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2776,10 +2702,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2813,10 +2738,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2850,10 +2774,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2887,10 +2810,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2924,10 +2846,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2961,10 +2882,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2998,10 +2918,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3035,10 +2954,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3072,10 +2990,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3109,10 +3026,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3146,10 +3062,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3183,10 +3098,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3220,10 +3134,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3257,10 +3170,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3294,10 +3206,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3331,10 +3242,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3368,10 +3278,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3405,10 +3314,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3442,10 +3350,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3479,10 +3386,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3516,10 +3422,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3553,10 +3458,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3590,10 +3494,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3627,10 +3530,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3664,10 +3566,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3701,10 +3602,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3738,10 +3638,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3775,10 +3674,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3812,10 +3710,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3849,10 +3746,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3885,10 +3781,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3922,10 +3817,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3959,10 +3853,9 @@ String xpath = "fn:min((xs:long(22),xs:short(10))) instance of xs:integer"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqOneOrMoreFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqOneOrMoreFuncTest.java index 0ff42c3..5aca063 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqOneOrMoreFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqOneOrMoreFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1480,10 +1441,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqRemoveFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqRemoveFuncTest.java index 0fbf74f..fb1a810 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqRemoveFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqRemoveFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqReverseFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqReverseFuncTest.java index 88bac22..6335371 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqReverseFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqReverseFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqSUMFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqSUMFuncTest.java index 11cbc4b..d110c08 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqSUMFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqSUMFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2036,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2073,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2110,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2147,10 +2090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2184,10 +2126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2221,10 +2162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2258,10 +2198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2295,10 +2234,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2332,10 +2270,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2369,10 +2306,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2406,10 +2342,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2443,10 +2378,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2480,10 +2414,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2517,10 +2450,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2554,10 +2486,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2591,10 +2522,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2628,10 +2558,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2665,10 +2594,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2702,10 +2630,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2739,10 +2666,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2776,10 +2702,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2813,10 +2738,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2850,10 +2774,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2887,10 +2810,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2924,10 +2846,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2961,10 +2882,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2998,10 +2918,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3035,10 +2954,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3072,10 +2990,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3109,10 +3026,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3146,10 +3062,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3183,10 +3098,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3220,10 +3134,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3257,10 +3170,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3294,10 +3206,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3331,10 +3242,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3368,10 +3278,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3405,10 +3314,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3442,10 +3350,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3479,10 +3386,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3516,10 +3422,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3553,10 +3458,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3590,10 +3494,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3627,10 +3530,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3664,10 +3566,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3701,10 +3602,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3738,10 +3638,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3775,10 +3674,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3812,10 +3710,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3849,10 +3746,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3886,10 +3782,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3923,10 +3818,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3960,10 +3854,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3997,10 +3890,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4034,10 +3926,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4071,10 +3962,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4108,10 +3998,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4145,10 +4034,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4182,10 +4070,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4219,10 +4106,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4256,10 +4142,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4293,10 +4178,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4330,10 +4214,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4367,10 +4250,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4404,10 +4286,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4441,10 +4322,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4478,10 +4358,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4515,10 +4394,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4552,10 +4430,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4589,10 +4466,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4626,10 +4502,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4663,10 +4538,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4700,10 +4574,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4737,10 +4610,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4774,10 +4646,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4811,10 +4682,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4848,10 +4718,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4885,10 +4754,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4922,10 +4790,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4959,10 +4826,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4996,10 +4862,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5033,10 +4898,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5070,10 +4934,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5107,10 +4970,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5144,10 +5006,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5181,10 +5042,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5218,10 +5078,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5255,10 +5114,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5292,10 +5150,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5329,10 +5186,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5366,10 +5222,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5403,10 +5258,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5440,10 +5294,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5477,10 +5330,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5514,10 +5366,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5551,10 +5402,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5588,10 +5438,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5625,10 +5474,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5662,10 +5510,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5699,10 +5546,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5736,10 +5582,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5773,10 +5618,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5810,10 +5654,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5847,10 +5690,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5884,10 +5726,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5921,10 +5762,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5958,10 +5798,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -5995,10 +5834,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6032,10 +5870,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6069,10 +5906,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -6106,10 +5942,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqSubsequenceFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqSubsequenceFuncTest.java index 2642325..6cdb8ea 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqSubsequenceFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqSubsequenceFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -76,10 +75,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -113,10 +111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -150,10 +147,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -187,10 +183,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -224,10 +219,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -261,10 +255,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -298,10 +291,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -335,10 +327,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -372,10 +363,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -409,10 +399,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -446,10 +435,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -483,10 +471,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -520,10 +507,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -557,10 +543,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -594,10 +579,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -631,10 +615,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -668,10 +651,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -705,10 +687,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -742,10 +723,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -779,10 +759,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -816,10 +795,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -853,10 +831,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqUnorderedFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqUnorderedFuncTest.java index 36f45cc..134a7ff 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqUnorderedFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqUnorderedFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -91,10 +90,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -128,10 +126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -165,10 +162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -202,10 +198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -239,10 +234,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -276,10 +270,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -313,10 +306,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -350,10 +342,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -387,10 +378,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -424,10 +414,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -461,10 +450,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -498,10 +486,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -535,10 +522,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -572,10 +558,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -609,10 +594,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -646,10 +630,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -683,10 +666,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -720,10 +702,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -757,10 +738,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -794,10 +774,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -831,10 +810,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -868,10 +846,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqZeroOrOneFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqZeroOrOneFuncTest.java index 908e246..bfb473a 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqZeroOrOneFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SeqZeroOrOneFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1480,10 +1441,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StartsWithFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StartsWithFuncTest.java index 90046d9..9a099a9 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StartsWithFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StartsWithFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StaticBaseURIFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StaticBaseURIFuncTest.java index 012d82c..1515357 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StaticBaseURIFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StaticBaseURIFuncTest.java
@@ -37,10 +37,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -71,16 +70,15 @@ DynamicContext dc = setupDynamicContext(schema); String uri = "ftp://ftp.is.co.za/rfc/somefile.txt"; - dc.set_base_uri(uri); + setBaseUri(uri); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -111,15 +109,14 @@ DynamicContext dc = setupDynamicContext(schema); String baseuri = "mailto:John.Doe@example.com"; - dc.set_base_uri(baseuri); + setBaseUri(baseuri); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -150,15 +147,14 @@ DynamicContext dc = setupDynamicContext(schema); String baseuri = "news:comp.infosystems.www.servers.unix"; - dc.set_base_uri(baseuri); + setBaseUri(baseuri); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -189,15 +185,14 @@ DynamicContext dc = setupDynamicContext(schema); String baseuri = "telnet://192.0.2.16:80/"; - dc.set_base_uri(baseuri); + setBaseUri(baseuri); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -228,15 +223,14 @@ DynamicContext dc = setupDynamicContext(schema); String baseuri = "tel:+1-816-555-1212"; - dc.set_base_uri(baseuri); + setBaseUri(baseuri); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -267,15 +261,14 @@ DynamicContext dc = setupDynamicContext(schema); String baseuri = "urn:oasis:names:specification:docbook:dtd:xml:4.1.2"; - dc.set_base_uri(baseuri); + setBaseUri(baseuri); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -306,15 +299,14 @@ DynamicContext dc = setupDynamicContext(schema); String baseuri = "http://www.example.com"; - dc.set_base_uri(baseuri); + setBaseUri(baseuri); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -344,15 +336,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.set_base_uri("http://www.example.com"); + setBaseUri("http://www.example.com"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -383,15 +374,14 @@ DynamicContext dc = setupDynamicContext(schema); String baseuri = "http://www.example.com"; - dc.set_base_uri(baseuri); + setBaseUri(baseuri); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -422,15 +412,14 @@ DynamicContext dc = setupDynamicContext(schema); String baseuri = "http://www.example.com"; - dc.set_base_uri(baseuri); + setBaseUri(baseuri); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -461,15 +450,14 @@ DynamicContext dc = setupDynamicContext(schema); String baseuri = "http://www.example.com"; - dc.set_base_uri(baseuri); + setBaseUri(baseuri); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -500,15 +488,14 @@ DynamicContext dc = setupDynamicContext(schema); String baseuri = "http://www.example.com"; - dc.set_base_uri(baseuri); + setBaseUri(baseuri); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -539,15 +526,14 @@ DynamicContext dc = setupDynamicContext(schema); String baseuri = "http://www.example.com"; - dc.set_base_uri(baseuri); + setBaseUri(baseuri); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringFuncTest.java index a50621f..e0c0a30 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringFuncTest.java
@@ -39,10 +39,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -76,10 +75,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -113,10 +111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -150,10 +147,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -187,10 +183,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -224,10 +219,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -261,10 +255,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -298,10 +291,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -335,10 +327,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -372,10 +363,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -409,10 +399,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -446,10 +435,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -483,10 +471,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -520,10 +507,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -557,10 +543,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -594,10 +579,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -631,10 +615,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -668,10 +651,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -705,10 +687,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -742,10 +723,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -779,10 +759,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -816,10 +795,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -853,10 +831,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -890,10 +867,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -927,10 +903,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -964,10 +939,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1001,10 +975,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1038,10 +1011,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1075,10 +1047,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1112,10 +1083,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1149,10 +1119,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1186,10 +1155,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1223,10 +1191,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1260,10 +1227,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1297,10 +1263,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1334,10 +1299,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1371,10 +1335,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1408,10 +1371,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1445,10 +1407,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1484,10 +1445,8 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context document! + ResultSequence rs = evaluate(null); // no context document! - ResultSequence rs = eval.evaluate(path); - actual = buildResultString(rs); } catch (XPathParserException ex) { @@ -1520,10 +1479,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1560,10 +1518,8 @@ try { XPath path = compileXPath(dc, xpath); - Evaluator eval = new DefaultEvaluator(dc, null); // no context document! + ResultSequence rs = evaluate(null); // no context document! - ResultSequence rs = eval.evaluate(path); - actual = buildResultString(rs); } catch (XPathParserException ex) {
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringJoinFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringJoinFuncTest.java index 9f9f270..07f5be3 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringJoinFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringJoinFuncTest.java
@@ -28,10 +28,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -65,10 +64,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -102,10 +100,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -139,10 +136,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -176,10 +172,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -213,10 +208,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -250,10 +244,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -287,10 +280,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -324,10 +316,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -361,10 +352,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -398,10 +388,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -435,10 +424,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -472,10 +460,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -509,10 +496,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -546,10 +532,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -583,10 +568,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -620,10 +604,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -657,10 +640,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -694,10 +676,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -731,10 +712,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -768,10 +748,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -805,10 +784,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -842,10 +820,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -879,10 +856,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -916,10 +892,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -953,10 +928,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringLengthFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringLengthFuncTest.java index 843f900..d96056c 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringLengthFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringLengthFuncTest.java
@@ -29,10 +29,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -66,10 +65,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -103,10 +101,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -140,10 +137,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -177,10 +173,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -214,10 +209,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -251,10 +245,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -288,10 +281,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -325,10 +317,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -362,10 +353,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -399,10 +389,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -436,10 +425,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -473,10 +461,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -510,10 +497,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -547,10 +533,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -584,10 +569,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -621,10 +605,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -658,10 +641,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -695,10 +677,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -732,10 +713,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -769,12 +749,7 @@ String actual = null; try { XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - Focus focus = new Focus(ResultSequenceFactory.create_new()); - dc.set_focus(focus); - - ResultSequence rs = eval.evaluate(path); + ResultSequence rs = evaluate(null); actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringToCodepointFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringToCodepointFuncTest.java index dacde6b..83760f2 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringToCodepointFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/StringToCodepointFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -259,10 +253,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -295,10 +288,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -332,10 +324,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -369,10 +360,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -406,10 +396,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -443,10 +432,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -480,10 +468,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -517,10 +504,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -554,10 +540,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -591,10 +576,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -628,10 +612,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -665,10 +648,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -702,10 +684,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -739,10 +720,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -776,10 +756,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -813,10 +792,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SubstringAfterFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SubstringAfterFuncTest.java index ea60cfd..f087591 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SubstringAfterFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SubstringAfterFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SubstringBeforeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SubstringBeforeFuncTest.java index 8ae03c6..db9396d 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SubstringBeforeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SubstringBeforeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SubstringFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SubstringFuncTest.java index 1cd22b3..4e5e9f1 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SubstringFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SubstringFuncTest.java
@@ -28,10 +28,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -65,10 +64,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -102,10 +100,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -139,10 +136,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -176,10 +172,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -213,10 +208,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -250,10 +244,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -287,10 +280,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -324,10 +316,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -361,10 +352,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -398,10 +388,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -435,10 +424,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -472,10 +460,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -509,10 +496,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -546,10 +532,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -583,10 +568,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -620,10 +604,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -657,10 +640,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -694,10 +676,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -731,10 +712,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -768,10 +748,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SurrogatesTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SurrogatesTest.java index b2b03b3..38a438a 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SurrogatesTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/SurrogatesTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TimezoneFromDateFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TimezoneFromDateFuncTest.java index 07537cd..34455bf 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TimezoneFromDateFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TimezoneFromDateFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TimezoneFromDateTimeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TimezoneFromDateTimeFuncTest.java index 354dad7..3a3e474 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TimezoneFromDateTimeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TimezoneFromDateTimeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TimezoneFromTimeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TimezoneFromTimeFuncTest.java index 431601a..2e587db 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TimezoneFromTimeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TimezoneFromTimeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TokenizeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TokenizeFuncTest.java index 0e9558e..8d75bc7 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TokenizeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TokenizeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -74,10 +73,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -111,10 +109,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -148,10 +145,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -185,10 +181,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -222,10 +217,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -259,10 +253,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -296,10 +289,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -333,10 +325,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -370,10 +361,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -407,10 +397,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -444,10 +433,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -481,10 +469,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -518,10 +505,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -555,10 +541,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -592,10 +577,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -629,10 +613,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -666,10 +649,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -703,10 +685,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -740,10 +721,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -777,10 +757,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -814,10 +793,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -851,10 +829,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -888,10 +865,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -925,10 +901,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -962,10 +937,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1003,10 +977,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1040,10 +1013,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1077,10 +1049,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1114,10 +1085,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TraceFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TraceFuncTest.java index f7d2a8c..596b3e7 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TraceFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TraceFuncTest.java
@@ -37,10 +37,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,11 +326,9 @@ "return fn:trace($var1 + $var2, \"The Value of $var 1 + $var2 is: \")"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -372,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -409,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -446,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -483,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -520,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -557,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -594,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -631,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -668,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -705,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -742,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -779,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TranslateFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TranslateFuncTest.java index 77584eb..38e7229 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TranslateFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TranslateFuncTest.java
@@ -28,10 +28,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -65,10 +64,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -102,10 +100,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -139,10 +136,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -175,10 +171,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -211,10 +206,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -247,10 +241,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -283,10 +276,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -320,10 +312,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -357,10 +348,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -394,10 +384,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -431,10 +420,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -468,10 +456,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -505,10 +492,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -542,10 +528,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -579,10 +564,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -616,10 +600,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -653,10 +636,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -690,10 +672,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -727,10 +708,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -764,10 +744,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -801,10 +780,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -838,10 +816,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -875,10 +852,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TrueFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TrueFuncTest.java index d02f680..606e79d 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TrueFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/TrueFuncTest.java
@@ -28,10 +28,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -65,10 +64,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -102,10 +100,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -139,10 +136,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -176,10 +172,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -213,10 +208,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -250,10 +244,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -287,10 +280,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -324,10 +316,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -361,10 +352,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -398,10 +388,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -435,10 +424,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -472,10 +460,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -509,10 +496,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -546,10 +532,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -583,10 +568,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -620,10 +604,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -657,10 +640,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -694,10 +676,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -731,10 +712,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -768,10 +748,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/UpperCaseFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/UpperCaseFuncTest.java index dcb3e5e..05b5a24 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/UpperCaseFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/UpperCaseFuncTest.java
@@ -28,10 +28,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -65,10 +64,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -102,10 +100,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -139,10 +136,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -176,10 +172,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -213,10 +208,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -250,10 +244,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -287,10 +280,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -324,10 +316,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -361,10 +352,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -398,10 +388,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -435,10 +424,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -472,10 +460,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -509,10 +496,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -546,10 +532,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -583,10 +568,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -620,10 +604,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -657,10 +640,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -694,10 +676,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -731,10 +712,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/YearFromDateFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/YearFromDateFuncTest.java index e9a671a..b91b872 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/YearFromDateFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/YearFromDateFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/YearFromDateTimeFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/YearFromDateTimeFuncTest.java index f91427b..441bf76 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/YearFromDateTimeFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/YearFromDateTimeFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/YearsFromDurationFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/YearsFromDurationFuncTest.java index 71d95de..fa1f5e7 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/YearsFromDurationFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/YearsFromDurationFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/compareFuncTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/compareFuncTest.java index 2e9a8a3..21f3fe4 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/compareFuncTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/functions/compareFuncTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -999,10 +973,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericAddTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericAddTest.java index a932aa3..44f8842 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericAddTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericAddTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2036,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2073,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2110,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2146,10 +2089,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2183,10 +2125,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericDivideTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericDivideTest.java index 754affa..531c26e 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericDivideTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericDivideTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2035,10 +1981,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2072,10 +2017,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericEqualTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericEqualTest.java index 2f72243..7cec83e 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericEqualTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericEqualTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2036,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2073,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2110,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2147,10 +2090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2184,10 +2126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2221,10 +2162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2258,10 +2198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2295,10 +2234,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2332,10 +2270,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2369,10 +2306,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2406,10 +2342,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2443,10 +2378,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2480,10 +2414,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2517,10 +2450,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2554,10 +2486,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2591,10 +2522,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2628,10 +2558,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2665,10 +2594,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2702,10 +2630,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2739,10 +2666,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2776,10 +2702,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2813,10 +2738,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2850,10 +2774,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2887,10 +2810,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2924,10 +2846,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2961,10 +2882,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2998,10 +2918,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3035,10 +2954,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3072,10 +2990,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3109,10 +3026,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3146,10 +3062,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3183,10 +3098,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3220,10 +3134,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3257,10 +3170,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3294,10 +3206,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3331,10 +3242,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3368,10 +3278,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3405,10 +3314,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3442,10 +3350,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3479,10 +3386,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3516,10 +3422,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3553,10 +3458,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3590,10 +3494,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3627,10 +3530,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3664,10 +3566,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3701,10 +3602,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3738,10 +3638,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3775,10 +3674,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3812,10 +3710,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3849,10 +3746,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3886,10 +3782,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3923,10 +3818,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3960,10 +3854,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3997,10 +3890,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4034,10 +3926,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4071,10 +3962,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4108,10 +3998,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4145,10 +4034,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4182,10 +4070,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4219,10 +4106,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4256,10 +4142,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4293,10 +4178,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4330,10 +4214,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4367,10 +4250,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4404,10 +4286,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4441,10 +4322,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4478,10 +4358,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4515,10 +4394,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4552,10 +4430,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4589,10 +4466,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4626,10 +4502,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4663,10 +4538,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4700,10 +4574,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4737,10 +4610,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4774,10 +4646,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4811,10 +4682,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4848,10 +4718,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericGTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericGTTest.java index b8b14b3..75b6654 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericGTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericGTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2036,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2073,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2110,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2147,10 +2090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2184,10 +2126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2221,10 +2162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2258,10 +2198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2295,10 +2234,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2332,10 +2270,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2369,10 +2306,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2406,10 +2342,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericIntegerDivideTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericIntegerDivideTest.java index d41e87c..402aa89 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericIntegerDivideTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericIntegerDivideTest.java
@@ -39,10 +39,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -76,10 +75,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -113,10 +111,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -150,10 +147,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -187,10 +183,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -224,10 +219,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -261,10 +255,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -298,10 +291,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -335,10 +327,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -372,10 +363,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -409,10 +399,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -446,10 +435,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -483,10 +471,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -520,10 +507,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -557,10 +543,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -594,10 +579,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -631,10 +615,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -668,10 +651,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -705,10 +687,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -742,10 +723,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -779,10 +759,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -816,10 +795,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -853,10 +831,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -890,10 +867,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -927,10 +903,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -964,10 +939,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1001,10 +975,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1038,10 +1011,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1075,10 +1047,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1112,10 +1083,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1149,10 +1119,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1186,10 +1155,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1223,10 +1191,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1260,10 +1227,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1297,10 +1263,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1334,10 +1299,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1371,10 +1335,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1408,10 +1371,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1445,10 +1407,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1482,10 +1443,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1519,10 +1479,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1556,10 +1515,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1593,10 +1551,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1630,10 +1587,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1667,10 +1623,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1704,10 +1659,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1813,10 +1765,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1849,10 +1800,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericLTTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericLTTest.java index fc54155..d3917bb 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericLTTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericLTTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2036,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2073,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2110,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2147,10 +2090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2184,10 +2126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2221,10 +2162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2258,10 +2198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2295,10 +2234,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2332,10 +2270,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2369,10 +2306,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2406,10 +2342,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2443,10 +2378,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2480,10 +2414,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2517,10 +2450,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2554,10 +2486,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2591,10 +2522,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2628,10 +2558,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2665,10 +2594,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2702,10 +2630,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2739,10 +2666,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2776,10 +2702,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2813,10 +2738,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2850,10 +2774,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2887,10 +2810,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2924,10 +2846,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2961,10 +2882,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2998,10 +2918,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3035,10 +2954,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3072,10 +2990,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3109,10 +3026,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3146,10 +3062,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3183,10 +3098,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3220,10 +3134,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3257,10 +3170,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3294,10 +3206,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3331,10 +3242,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3368,10 +3278,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3405,10 +3314,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3442,10 +3350,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3479,10 +3386,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3516,10 +3422,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3553,10 +3458,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3590,10 +3494,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3627,10 +3530,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3664,10 +3566,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3701,10 +3602,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3738,10 +3638,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3775,10 +3674,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3812,10 +3710,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3849,10 +3746,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3886,10 +3782,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3923,10 +3818,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3960,10 +3854,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -3997,10 +3890,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4034,10 +3926,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4071,10 +3962,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4108,10 +3998,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4145,10 +4034,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4182,10 +4070,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4219,10 +4106,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4256,10 +4142,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4293,10 +4178,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4330,10 +4214,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4367,10 +4250,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4404,10 +4286,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4441,10 +4322,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4478,10 +4358,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4515,10 +4394,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4552,10 +4430,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4589,10 +4466,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4626,10 +4502,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4663,10 +4538,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4700,10 +4574,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4737,10 +4610,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4774,10 +4646,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -4811,10 +4682,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericModTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericModTest.java index b77fb96..88bc74b 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericModTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericModTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -814,10 +793,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -851,10 +829,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericMultiplyTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericMultiplyTest.java index 5c99f39..1b02e33 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericMultiplyTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericMultiplyTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1443,10 +1405,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1480,10 +1441,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericSubtractTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericSubtractTest.java index 6b423a1..a68b0c7 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericSubtractTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericSubtractTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1481,10 +1442,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1518,10 +1478,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1555,10 +1514,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1592,10 +1550,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1629,10 +1586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1666,10 +1622,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1703,10 +1658,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1740,10 +1694,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1777,10 +1730,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1814,10 +1766,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1851,10 +1802,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1888,10 +1838,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1925,10 +1874,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1962,10 +1910,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1999,10 +1946,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2036,10 +1982,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2073,10 +2018,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2110,10 +2054,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2147,10 +2090,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2184,10 +2126,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2221,10 +2162,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2258,10 +2198,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2294,10 +2233,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -2331,10 +2269,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericUnaryMinusTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericUnaryMinusTest.java index 7a9983b..c75eaa9 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericUnaryMinusTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericUnaryMinusTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericUnaryPlusTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericUnaryPlusTest.java index 0587bb5..e3716ba 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericUnaryPlusTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/numeric/NumericUnaryPlusTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -112,10 +110,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -149,10 +146,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -186,10 +182,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -223,10 +218,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -260,10 +254,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -297,10 +290,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -334,10 +326,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -371,10 +362,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -408,10 +398,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -445,10 +434,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -482,10 +470,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -519,10 +506,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -556,10 +542,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -593,10 +578,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -630,10 +614,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -667,10 +650,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -704,10 +686,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -741,10 +722,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -778,10 +758,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -815,10 +794,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -852,10 +830,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -889,10 +866,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -926,10 +902,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -963,10 +938,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1000,10 +974,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1037,10 +1010,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1074,10 +1046,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1111,10 +1082,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1148,10 +1118,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1185,10 +1154,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1222,10 +1190,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1259,10 +1226,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1296,10 +1262,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1333,10 +1298,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1370,10 +1334,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1407,10 +1370,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1444,10 +1406,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/CatalogTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/CatalogTest.java index 6ff1082..4450e7e 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/CatalogTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/CatalogTest.java
@@ -38,10 +38,9 @@ String xpath = "for $x in $input-context//*:input-file[count(@variable) = 0 and ./text() != \"emptydoc\"] return string($x/../@name)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<missing-variable>" + buildXMLResultString(rs) + "</missing-variable>"; @@ -75,10 +74,9 @@ String xpath = "$input-context//*:test-case[@scenario = \"standard\"][fn:count(*:output-file) = 0]/@name/string()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<standard-no-outputfile>" + buildXMLResultString(rs) + "</standard-no-outputfile>"; @@ -113,10 +111,9 @@ "$input-context//*:test-case[@scenario = \"runtime-error\" or @scenario = \"parse-error\"][fn:count(*:expected-error) = 0 and fn:count(*:output-file[@compare = \"Inspect\"]) = 0]/@name/string()"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<error-no-expected-error>" + buildXMLResultString(rs) + "</error-no-expected-error>";
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/MiscFunctionsTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/MiscFunctionsTest.java index 4da070b..913fccd 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/MiscFunctionsTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/MiscFunctionsTest.java
@@ -42,10 +42,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -89,10 +88,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -125,10 +123,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -162,10 +159,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -199,10 +195,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -237,10 +232,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -274,10 +268,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -310,10 +303,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -346,10 +338,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -384,10 +375,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -420,10 +410,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -456,10 +445,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -492,10 +480,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -529,10 +516,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -565,10 +551,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -601,10 +586,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -637,10 +621,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -673,10 +656,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -710,10 +692,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/NotationEQSITest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/NotationEQSITest.java index a4137a0..f671bff 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/NotationEQSITest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/NotationEQSITest.java
@@ -43,10 +43,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -77,15 +76,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -116,15 +114,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -155,15 +152,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -193,15 +189,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -232,15 +227,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -271,15 +265,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -309,15 +302,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -348,15 +340,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -386,15 +377,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -424,15 +414,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -462,15 +451,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -500,15 +488,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -538,15 +525,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -577,15 +563,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -616,15 +601,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -655,15 +639,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -694,15 +677,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -733,15 +715,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -772,15 +753,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -811,15 +791,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -850,15 +829,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("myns", "http://www.example.com/notation"); + addNamespace("myns", "http://www.example.com/notation"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/NumericEqualSITest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/NumericEqualSITest.java index 36f5c47..15d0e73 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/NumericEqualSITest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/NumericEqualSITest.java
@@ -45,10 +45,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -84,10 +83,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/STAxesTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/STAxesTest.java index 0d6015f..8fdb818 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/STAxesTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/STAxesTest.java
@@ -37,10 +37,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -73,10 +72,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -109,10 +107,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -145,10 +142,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -181,10 +177,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -217,10 +212,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -253,10 +247,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -289,10 +282,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -325,10 +317,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -361,10 +352,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -397,10 +387,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -433,10 +422,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -469,10 +457,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -505,10 +492,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -541,10 +527,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -577,10 +562,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -613,10 +597,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -649,10 +632,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -685,10 +667,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -721,10 +702,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -757,10 +737,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/SeqExprCastSITest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/SeqExprCastSITest.java index 89e8a30..bc4508f 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/SeqExprCastSITest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/SeqExprCastSITest.java
@@ -48,10 +48,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -87,10 +86,9 @@ String xpath = "myType:QNameBased(\"value1\")"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -126,10 +124,9 @@ String xpath = "myType:QNameBased(\"value1\") cast as myType:QNameBased"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -165,10 +162,9 @@ String xpath = "xs:QName(\"value1\") cast as myType:QNameBased"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -203,10 +199,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -240,10 +235,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -274,15 +268,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -313,15 +306,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -352,15 +344,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -391,15 +382,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -430,15 +420,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -469,15 +458,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -508,15 +496,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -547,15 +534,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -586,15 +572,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -625,15 +610,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -664,15 +648,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -703,15 +686,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -742,15 +724,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -781,15 +762,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -820,15 +800,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -859,15 +838,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -898,15 +876,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -937,15 +914,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -976,15 +952,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1015,15 +990,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1055,15 +1029,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1094,15 +1067,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1133,15 +1105,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1172,15 +1143,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1211,15 +1181,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1250,15 +1219,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1289,15 +1257,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1328,15 +1295,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1367,15 +1333,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1406,15 +1371,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1445,15 +1409,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1484,15 +1447,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1523,15 +1485,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1562,15 +1523,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1601,15 +1561,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1640,15 +1599,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1679,15 +1637,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1718,15 +1675,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1757,15 +1713,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1796,15 +1751,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1835,15 +1789,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -1874,15 +1827,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("atomic", "http://www.w3.org/XQueryTest"); + addNamespace("atomic", "http://www.w3.org/XQueryTest"); String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseNSTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseNSTest.java index 59619ff..675d080 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseNSTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseNSTest.java
@@ -24,16 +24,15 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("music","http://www.example.org/music/records"); + addNamespace("music","http://www.example.org/music/records"); String xpath = "$input-context//music:title"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<Q2>" + buildXMLResultString(rs) + "</Q2>"; @@ -63,15 +62,14 @@ XSModel schema = getGrammar(); DynamicContext dc = setupDynamicContext(schema); - dc.add_namespace("dt", "http://www.w3.org/2001/XMLSchema"); + addNamespace("dt", "http://www.w3.org/2001/XMLSchema"); String xpath = "$input-context//*[@dt:*]"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<Q3>" + buildXMLResultString(rs) + "</Q3>";
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseSEQTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseSEQTest.java index 10215a9..14729c0 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseSEQTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseSEQTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs); @@ -75,10 +74,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseSGMLTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseSGMLTest.java index 765640a..f955c3a 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseSGMLTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseSGMLTest.java
@@ -38,10 +38,9 @@ String xpath = "$input-context//report//para"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -75,10 +74,9 @@ String xpath = "$input-context//intro/para"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" +buildXMLResultString(rs) + "</result>"; @@ -112,10 +110,9 @@ String xpath = "((($input-context//chapter)[2]//section)[3]//para)[2]"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -149,10 +146,9 @@ String xpath = "$input-context//para[@security = \"c\"]"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -186,10 +182,9 @@ String xpath = "$input-context//section[.//title[contains(., \"is SGML\")]]"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -223,10 +218,9 @@ String xpath = "$input-context//section[.//title/text()[contains(., \"is SGML\")]]"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>"; @@ -261,10 +255,9 @@ "return $input-context//topic[@topicid = $id]"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>";
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseSTRINGTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseSTRINGTest.java index 58e2381..3fdbf4a 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseSTRINGTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseSTRINGTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<result>" + buildXMLResultString(rs) + "</result>";
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseTREETest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseTREETest.java index 6e609cd..745b231 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseTREETest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UseCaseTREETest.java
@@ -38,10 +38,9 @@ String xpath = "count($input-context/book/section)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = "<top_section_count>" + buildResultString(rs) + "</top_section_count>";
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UserDefinedSITest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UserDefinedSITest.java index 789cf97..c03e55f 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UserDefinedSITest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/UserDefinedSITest.java
@@ -48,10 +48,9 @@ String xpath = "myType:sizeType(1)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -88,10 +87,9 @@ String xpath = "myType:sizeType(20)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -124,10 +122,9 @@ String xpath = "myType:sizeType(1) + myType:sizeType(2)"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -164,10 +161,9 @@ String xpath = "myType:stringBased(\"valid value 4\")"; String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -203,10 +199,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -242,10 +237,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -281,10 +275,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -320,10 +313,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -359,10 +351,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -398,10 +389,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/ValidateExpressionTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/ValidateExpressionTest.java index 8cccdaa..bafc755 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/ValidateExpressionTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/ValidateExpressionTest.java
@@ -37,10 +37,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -74,10 +73,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -111,10 +109,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -147,10 +144,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -183,10 +179,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -219,10 +214,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -255,10 +249,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -291,10 +284,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -327,10 +319,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -364,10 +355,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -401,10 +391,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -438,10 +427,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -475,10 +463,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -512,10 +499,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -549,10 +535,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -586,10 +571,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -623,10 +607,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -660,10 +643,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -697,10 +679,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -734,10 +715,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -771,10 +751,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs); @@ -807,10 +786,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/ancestorAxisTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/ancestorAxisTest.java index f65a3c2..d199e93 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/ancestorAxisTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/ancestorAxisTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/ancestorOrSelfAxisTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/ancestorOrSelfAxisTest.java index e5a37bf..9772cbe 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/ancestorOrSelfAxisTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/ancestorOrSelfAxisTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/followingSiblingAxisTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/followingSiblingAxisTest.java index ca725c2..4aeddba 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/followingSiblingAxisTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/followingSiblingAxisTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs);
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/precedingSiblingAxisTest.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/precedingSiblingAxisTest.java index 54f7a0c..0e2b226 100644 --- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/precedingSiblingAxisTest.java +++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/testsuite/schema/precedingSiblingAxisTest.java
@@ -38,10 +38,9 @@ String xpath = extractXPathExpression(xqFile, inputFile); String actual = null; try { - XPath path = compileXPath(dc, xpath); - - Evaluator eval = new DefaultEvaluator(dc, domDoc); - ResultSequence rs = eval.evaluate(path); + compileXPath(xpath); + ResultSequence rs = evaluate(domDoc); + actual = buildXMLResultString(rs);