4:21 p.m.
Author: dgolovin
Date: 2009-03-05 17:21:03 -0500 (Thu, 05 Mar 2009)
New Revision: 14061
Modified:
trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/ELParserTest.java
Log:
enable back test for EL expression
#{?\226?\128?\153#{?\226?\128?\153}exprB}
Modified:
trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/ELParserTest.java
===================================================================
---
trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/ELParserTest.java 2009-03-05
20:32:23 UTC (rev 14060)
+++
trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/ELParserTest.java 2009-03-05
22:21:03 UTC (rev 14061)
@@ -7,7 +7,7 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.common.el.core.test;
import java.util.List;
@@ -26,42 +26,44 @@
import junit.framework.TestCase;
public class ELParserTest extends TestCase {
-
- public ELParserTest() {}
-
+
+ public ELParserTest() {
+ }
+
protected void setUp() throws Exception {
}
-
+
public void testTokenizerOnCorrectEL() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
- //1. One variable
+ // 1. One variable
checkCorrectEL(t, "#{a}");
- //2. Two EL instances
+ // 2. Two EL instances
checkCorrectEL(t, "#{a}#{b}");
- //3. Property invocation
+ // 3. Property invocation
checkCorrectEL(t, "#{a.b}");
- //4. Argument invocation
+ // 4. Argument invocation
checkCorrectEL(t, "#{a.b['xxx']}");
- //5a. Method invocation
+ // 5a. Method invocation
checkCorrectEL(t, "#{a.b()}");
- //5b. Method invocation with one parameter
+ // 5b. Method invocation with one parameter
checkCorrectEL(t, "#{a.b(c)}");
- //5b. Method invocation with two parameters
+ // 5b. Method invocation with two parameters
checkCorrectEL(t, "#{a.b(c.d , e['u'])}");
- //6. Numeric
+ // 6. Numeric
checkCorrectEL(t, "#{a.b(16.900)}");
- //7. Boolean
+ // 7. Boolean
checkCorrectEL(t, "#{a.b(false)}");
- //8. Operators
+ // 8. Operators
checkCorrectEL(t, "#{a.b(7 + 8) * 4 / 2 - 1}");
- //9. Complex expressions
+ // 9. Complex expressions
checkCorrectEL(t, "#{a.b(7 + 8) * (4 / 2 - 1)/c.d}");
- //10. Complex expressions
- checkCorrectEL(t, "#{a.b(7 + 8) * (4 / 2 - 1)/c.d}");
+ // 10. Complex expressions
+ checkCorrectEL(t, "#{a.b(7 + 8) * (4 / 2 - 1)/c.d}");
}
/**
- * JBIDE-3132 An OutOfMemory exception is thrown by Code assist for "#{messages[
"
+ * JBIDE-3132 An OutOfMemory exception is thrown by Code assist for
+ * "#{messages[ "
*/
public void testJBIDE3132() {
ELParser parser = ELParserUtil.getJbossFactory().createParser();
@@ -74,32 +76,32 @@
public void testElEmptyOperator() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
- checkCorrectEL(t, "#{empty a}");
+ checkCorrectEL(t, "#{empty a}");
}
-
+
public void testElLogicalNotOperators() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
checkCorrectEL(t, "#{not a == null}");
checkCorrectEL(t, "#{!a eq null}");
}
-
+
public void testElLogicalAndOperators() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
checkCorrectEL(t, "#{a!=null and a!=1}");
checkCorrectEL(t, "#{a!=null && a!=1}");
}
-
+
public void testElLogicalOrOperators() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
checkCorrectEL(t, "#{a!=null or a!=1}");
checkCorrectEL(t, "#{a!=null || a!=1}");
}
-
+
public void testElConditionalOperator() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
checkCorrectEL(t, "#{a?1:2}");
}
-
+
public void testElRelationalOperator() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
checkCorrectEL(t, "#{a == b}");
@@ -115,9 +117,9 @@
checkCorrectEL(t, "#{a >= b}");
checkCorrectEL(t, "#{a le b}");
checkCorrectEL(t, "#{'a' < 'b'}");
-
+
}
-
+
public void testElArithmeticOperators() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
checkCorrectEL(t, "#{a*b}");
@@ -129,83 +131,91 @@
checkCorrectEL(t, "#{a+b}");
checkCorrectEL(t, "#{-b+1}");
checkCorrectEL(t, "#{-b}");
- }
-
+ }
+
public void testElLiteralExpressions() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
- checkCorrectEL(t,"#{\"#{\"}");
- checkCorrectEL(t,"\\#{exprA}");
- checkCorrectEL(t,"#{\"\\\"exprA\\\"\"}");
- checkCorrectEL(t,"#{\"\\\"#\\\"\"}");
- //checkCorrectEL(t,"#{’#’}"); //Why this is correct?
+ checkCorrectEL(t, "#{\"#{\"}");
+ checkCorrectEL(t, "\\#{exprA}");
+ checkCorrectEL(t, "#{\"\\\"exprA\\\"\"}");
+ checkCorrectEL(t, "#{\"\\\"#\\\"\"}");
+ // Ask google :)
+ // http://java.sun.com/javaee/5/docs/tutorial/doc/bnahq.html#indexterm-357
+ checkCorrectEL(t,"#{’#{’}exprB}"); //Why this is correct?
}
-
+
public void testElReferencesObjectProperties() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
- checkCorrectEL(t,"#{customer.address[\"street\"]}");
- checkCorrectEL(t,"#{customer.address['street']}");
- checkCorrectEL(t,"#{planets[object.counter].mass}");
+ checkCorrectEL(t, "#{customer.address[\"street\"]}");
+ checkCorrectEL(t, "#{customer.address['street']}");
+ checkCorrectEL(t, "#{planets[object.counter].mass}");
}
-
+
public void testElSimpleTypes() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
- checkCorrectEL(t,"#{\"string\"}");
- checkCorrectEL(t,"#{'string'}");
- checkCorrectEL(t,"#{11.0}");
- checkCorrectEL(t,"#{1.2E4}");
- checkCorrectEL(t,"#{null}");
- checkCorrectEL(t,"#{1}");
- checkCorrectEL(t,"#{true}");
- checkCorrectEL(t,"#{false}");
+ checkCorrectEL(t, "#{\"string\"}");
+ checkCorrectEL(t, "#{'string'}");
+ checkCorrectEL(t, "#{11.0}");
+ checkCorrectEL(t, "#{1.2E4}");
+ checkCorrectEL(t, "#{null}");
+ checkCorrectEL(t, "#{1}");
+ checkCorrectEL(t, "#{true}");
+ checkCorrectEL(t, "#{false}");
}
public void testComplexMath() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
- checkCorrectEL(t, "#{(7 * (13 + 7.9)) * (a + b.c / d) / (1.E5) -
(1/a.b+8./c.d)}");
+ checkCorrectEL(t,
+ "#{(7 * (13 + 7.9)) * (a + b.c / d) / (1.E5) - (1/a.b+8./c.d)}");
}
public void testComplexInvocation() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
- checkCorrectEL(t,
"#{a.b[a1.b1(a2.b2,a3.b3(x))][y].c(a4.b4,a5.b5[a6(b6)])}");
+ checkCorrectEL(t,
+ "#{a.b[a1.b1(a2.b2,a3.b3(x))][y].c(a4.b4,a5.b5[a6(b6)])}");
}
public void testSeveralELInstances() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
checkCorrectEL(t, "aaa#{a}bbb#{1}#{c()}");
}
-
+
private void checkCorrectEL(Tokenizer t, String test) {
LexicalToken token = t.parse(test);
assertEquals(test, restore(token));
List<SyntaxError> errors = t.getErrors();
- assertEquals("EL '" + test + "' has no syntax problems.",
0, errors.size());
+ assertEquals("EL '" + test + "' has no syntax problems.",
0, errors
+ .size());
System.out.println("Passed correct EL '" + test + "'");
}
public void testTokenizerOnIncorrectEL() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
- //1. Dot unfollowed by name
+ // 1. Dot unfollowed by name
checkIncorrectEL(t, "#{a.}", 4);
- //2. Incorrect use of ')'
+ // 2. Incorrect use of ')'
checkIncorrectEL(t, "#{a.b + -c.d + g)}", 16);
- //2. Incorrect use of '.' in second EL instance
+ // 2. Incorrect use of '.' in second EL instance
checkIncorrectEL(t, "#{a.b + -c.d + g}#{hh.vv..m()}", 25);
}
- private void checkIncorrectEL(Tokenizer t, String test, int expectedErrorPosition) {
+ private void checkIncorrectEL(Tokenizer t, String test,
+ int expectedErrorPosition) {
LexicalToken token = t.parse(test);
List<SyntaxError> errors = t.getErrors();
assertTrue("EL '" + test + "' has syntax problems. ",
errors.size() > 0);
assertEquals(expectedErrorPosition, errors.get(0).getPosition());
String correctPart = test.substring(0, expectedErrorPosition);
String parsed = restore(token);
- assertTrue("Parsed value should be identical to source at least until first
problem.", parsed.startsWith(correctPart));
+ assertTrue(
+ "Parsed value should be identical to source at least until first
problem.",
+ parsed.startsWith(correctPart));
System.out.println("Passed incorrect EL '" + test + "'");
}
private String restore(LexicalToken token) {
StringBuffer sb = new StringBuffer();
- while(token != null) {
+ while (token != null) {
sb.append(token.getText());
token = token.getNextToken();
}
@@ -216,7 +226,7 @@
static int CALL_NUMBER = 1000;
public void testMultiThreadAccess() {
-
+
final ELParserFactory factory = ELParserUtil.getJbossFactory();
final Random random = new Random();
class Z {
@@ -224,12 +234,15 @@
int parserErrors = 0;
int syntaxErrors = 0;
int expectedSyntaxErrors = 0;
+
synchronized void addParserError() {
parserErrors++;
}
+
synchronized void addSyntaxError() {
syntaxErrors++;
}
+
synchronized void addExpectedSyntaxError() {
expectedSyntaxErrors++;
}
@@ -243,15 +256,19 @@
try {
for (int j = 0; j < CALL_NUMBER; j++) {
boolean addError = random.nextInt(100) < 50;
- if(addError) z.addExpectedSyntaxError();
+ if (addError)
+ z.addExpectedSyntaxError();
ELParser parser = factory.createParser();
- String el = "#{(a + b(c.d" + random.nextInt(1000) + ") +
c().k" + (addError ? "." : "") + ") + 9.7}";
+ String el = "#{(a + b(c.d" + random.nextInt(1000)
+ + ") + c().k" + (addError ? "." : "")
+ + ") + 9.7}";
ELModel model = parser.parse(el);
LexicalToken t = model.getFirstToken();
- if(!el.equals(restore(t))) {
+ if (!el.equals(restore(t))) {
z.addParserError();
}
- if(model.getSyntaxErrors() != null && model.getSyntaxErrors().size() >
0) {
+ if (model.getSyntaxErrors() != null
+ && model.getSyntaxErrors().size() > 0) {
z.addSyntaxError();
}
}
@@ -263,21 +280,21 @@
new Thread(r).start();
}
- while(z.counter > 0) {
+ while (z.counter > 0) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
-
+
}
}
- System.out.println("testMultiThreadAccess: Expected syntax errors=" +
z.expectedSyntaxErrors);
+ System.out.println("testMultiThreadAccess: Expected syntax errors="
+ + z.expectedSyntaxErrors);
assertEquals(0, z.parserErrors);
assertEquals(z.expectedSyntaxErrors, z.syntaxErrors);
-
-
+
}
}