Revert of commit f4952d2d87205b873cfc765b251a58597c9d6059
[398604] [xpath3] Implement let expressions
This is not going into Kepler, put in a branch for now.
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 73caafe..e0887c6 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
@@ -57,7 +57,7 @@
* 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
- * Lukasz Wycisk - bug 361060 - Aggregations with nil=ÕtrueÕ throw exceptions.
+ * Lukasz Wycisk - bug 361060 - Aggregations with nil='true' throw exceptions.
* Lukasz Wycisk - bug 361059 - FnRoundHalfToEven is wrong in case of 2 arguments
* Jesper Moller - bug 388504 - XPath scanner does not detect non-ASCII names
******************************************************************************/
@@ -204,7 +204,7 @@
setupDynamicContext(null);
- compileXPath("count(//Schlssel)");
+ compileXPath("count(//Schl\u00FCssel)");
ResultSequence rs = evaluate(domDoc);
String actual = rs.first().getStringValue();
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestXPath30.java b/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestXPath30.java
deleted file mode 100644
index e5625fb..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/src/org/eclipse/wst/xml/xpath2/processor/test/TestXPath30.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- *Copyright (c) 2013 Jesper Steen Møller 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
- *http://www.eclipse.org/legal/epl-v10.html
- *
- *Contributors:
- * Jesper Steen Møller - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath2.processor.test;
-
-import java.math.BigInteger;
-import java.net.URL;
-
-import org.eclipse.wst.xml.xpath2.api.ResultSequence;
-import org.eclipse.wst.xml.xpath2.api.XPath2Expression;
-import org.eclipse.wst.xml.xpath2.processor.Engine;
-import org.eclipse.wst.xml.xpath2.processor.JFlexCupParser;
-import org.eclipse.wst.xml.xpath2.processor.XPathParser;
-import org.eclipse.wst.xml.xpath2.processor.XPathParserException;
-import org.eclipse.wst.xml.xpath2.processor.ast.XPath;
-import org.eclipse.wst.xml.xpath2.processor.internal.ast.LetExpr;
-import org.eclipse.wst.xml.xpath2.processor.util.DynamicContextBuilder;
-import org.eclipse.wst.xml.xpath2.processor.util.StaticContextBuilder;
-
-public class TestXPath30 extends AbstractPsychoPathTest {
-
- public void testParseInvalidXPathExpression() throws Exception {
- try {
- XPathParser xpp = new JFlexCupParser();
- String xpath = "let $ := 123 return $a";
- xpp.parse(xpath);
- fail("XPath parsing suceeded when it should have failed.");
- } catch (XPathParserException ex) {
-
- }
- }
-
- public void testParseValidXPathExpression() throws Exception {
- StaticContextBuilder staticContextBuilder = new StaticContextBuilder();
-
- XPath2Expression expr = new Engine().parseExpression("let $a := 1, $b := $a+2, $c := $a + $b return $c+5", staticContextBuilder);
- DynamicContextBuilder dynamicContextBuilder = new DynamicContextBuilder(staticContextBuilder);
- ResultSequence result = expr.evaluate(dynamicContextBuilder, new Object[0]);
- assertEquals(1, result.size());
- assertEquals(BigInteger.valueOf(9), result.value(0));
- }
-}
