Author: ekoneil
Date: Mon Aug 2 15:53:58 2004
New Revision: 35605
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/script/el/BundleVariableResolver.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
Log:
Catch the JUnit DRTs up with the binding context name change.
BB: self
DRT: NetUI JUnit pass
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/script/el/BundleVariableResolver.java
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/script/el/BundleVariableResolver.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/script/el/BundleVariableResolver.java
Mon Aug 2 15:53:58 2004
@@ -51,8 +51,8 @@
{
assert vr instanceof NetUIVariableResolver;
NetUIVariableResolver nvr = (NetUIVariableResolver)vr;
- assert nvr.resolveVariable("pageContext") != null &&
nvr.resolveVariable("pageContext") instanceof PageContextAttributeMap;
- PageContext pageContext =
(PageContext)((PageContextAttributeMap)nvr.resolveVariable("pageContext")).unwrap();
+ assert nvr.resolveVariable("pageScope") != null &&
nvr.resolveVariable("pageScope") instanceof PageContextAttributeMap;
+ PageContext pageContext =
(PageContext)((PageContextAttributeMap)nvr.resolveVariable("pageScope")).unwrap();
return pageContext.getAttribute("bundle");
}
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
Mon Aug 2 15:53:58 2004
@@ -41,7 +41,7 @@
_fauxPageContext.setAttribute("iproduct",
IProduct.Factory.getInstance(productName, 2500.00));
- Object result = evaluateExpression("{pageContext.iproduct.name}",
_fauxPageContext);
+ Object result = evaluateExpression("{pageScope.iproduct.name}",
_fauxPageContext);
assertEquals(productName, result);
}
@@ -62,8 +62,8 @@
_fauxPageContext.setAttribute("currentItem", item);
- Object key = evaluateExpression("{pageContext.currentItem.key}",
_fauxPageContext);
- Object value =
evaluateExpression("{pageContext.currentItem.value}", _fauxPageContext);
+ Object key = evaluateExpression("{pageScope.currentItem.key}",
_fauxPageContext);
+ Object value = evaluateExpression("{pageScope.currentItem.value}",
_fauxPageContext);
System.out.println("key: " + key + " value: " + value);
}
}
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
Mon Aug 2 15:53:58 2004
@@ -42,17 +42,17 @@
// expression, shouldParse, isExpression, containsExpression,
Object[][] isExprData =
{
- {"{pageContext.foo.bar.baz.property}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
- {"{pageContext.foo.bar.baz[42].property.nextProperty}", Boolean.TRUE,
Boolean.TRUE, Boolean.TRUE},
- {"\\{pageContext.foo.bar.baz.property}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
- {"{pageContext.foo.bar.baz.property\\}", Boolean.FALSE, Boolean.FALSE,
Boolean.FALSE},
- {"{pageContext.foo.bar.baz['\\\"[EMAIL PROTECTED]']}", Boolean.FALSE,
Boolean.TRUE, Boolean.TRUE},
-
- {"{pageContext.foo.bar.baz[\"\\\"\\\"\\\"\\\"\"]}", Boolean.TRUE,
Boolean.TRUE, Boolean.TRUE},
- {"{pageContext.foo.bar.baz[\"\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
- {"{pageContext.foo.bar.baz[\"'\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE}, // Radar bug: 16763
- {"{pageContext.foo.bar.baz['\"']}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE}, // Radar bug: 16763
- {"{pageContext.foo.bar.baz[\"[EMAIL PROTECTED]"]}", Boolean.TRUE,
Boolean.TRUE, Boolean.TRUE},
+ {"{pageScope.foo.bar.baz.property}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
+ {"{pageScope.foo.bar.baz[42].property.nextProperty}", Boolean.TRUE,
Boolean.TRUE, Boolean.TRUE},
+ {"\\{pageScope.foo.bar.baz.property}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
+ {"{pageScope.foo.bar.baz.property\\}", Boolean.FALSE, Boolean.FALSE,
Boolean.FALSE},
+ {"{pageScope.foo.bar.baz['\\\"[EMAIL PROTECTED]']}", Boolean.FALSE,
Boolean.TRUE, Boolean.TRUE},
+
+ {"{pageScope.foo.bar.baz[\"\\\"\\\"\\\"\\\"\"]}", Boolean.TRUE,
Boolean.TRUE, Boolean.TRUE},
+ {"{pageScope.foo.bar.baz[\"\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
+ {"{pageScope.foo.bar.baz[\"'\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE}, // Radar bug: 16763
+ {"{pageScope.foo.bar.baz['\"']}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE}, // Radar bug: 16763
+ {"{pageScope.foo.bar.baz[\"[EMAIL PROTECTED]"]}", Boolean.TRUE,
Boolean.TRUE, Boolean.TRUE},
{"{", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, "{"},
{"{{", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, "{{"},
@@ -61,60 +61,60 @@
{"}", Boolean.TRUE, Boolean.FALSE, Boolean.FALSE, "}"},
{"}}", Boolean.TRUE, Boolean.FALSE, Boolean.FALSE, "}}"},
{"", Boolean.TRUE, Boolean.FALSE, Boolean.FALSE, ""},
- {"{pageContext.bean._Property}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
+ {"{pageScope.bean._Property}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
// Radar 30458
- {"{ pageContext.bean}", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE},
- {"{pageContext. bean}", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE},
- {"{pageContext.bean }", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE},
- {"[EMAIL PROTECTED]", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE},
+ {"{ pageScope.bean}", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE},
+ {"{pageScope. bean}", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE},
+ {"{pageScope.bean }", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE},
+ {"[EMAIL PROTECTED]", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE},
{"[EMAIL PROTECTED]", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE},
{"{}", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE},
{"[EMAIL PROTECTED]", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE},
{"{ }", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE},
// contain expressions, !expressions
- {" {pageContext.foo.bar.baz.property} ", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
- {" {pageContext.foo.bar.baz.property\\} ", Boolean.FALSE,
Boolean.FALSE, Boolean.FALSE},
- {" {actionForm} {pageContext.foo.bar.baz.property\\} {container} ",
Boolean.FALSE, null, null},
- {" {actionForm} \\{pageContext.foo.bar.baz.property\\} {container} ",
Boolean.TRUE, Boolean.FALSE, Boolean.TRUE},
+ {" {pageScope.foo.bar.baz.property} ", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
+ {" {pageScope.foo.bar.baz.property\\} ", Boolean.FALSE, Boolean.FALSE,
Boolean.FALSE},
+ {" {actionForm} {pageScope.foo.bar.baz.property\\} {container} ",
Boolean.FALSE, null, null},
+ {" {actionForm} \\{pageScope.foo.bar.baz.property\\} {container} ",
Boolean.TRUE, Boolean.FALSE, Boolean.TRUE},
{" {container}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE},
{"{container} ", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE},
{"{container}{actionForm} ", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
// nested exceptions
- {"{pageContext.foo.bar.baz[{foo.bar.baz.nest}]}", Boolean.FALSE, null,
null},
- {"{pageContext.foo.bar.baz[\"{}\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
- {"{pageContext.foo.bar.baz[\"{\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
- {"{pageContext.foo.bar.baz[\"}\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
- {"{pageContext.foo.bar.baz[\"'\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE}, // FAIL 1/4/2003 -- fixed in AttributeParser
- {"{pageContext.foo.bar.baz[\"\\\"\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE}, // FAIL 1/4/2003 -- fixed in AttributeParser
- {"{pageContext.foo.bar.baz[\"{foo.bar.baz}\"]}", Boolean.TRUE,
Boolean.TRUE, Boolean.TRUE},
- {"{pageContext.foo.bar.baz[\"\\\\{foo.bar.{baz.nest}}\"]}",
Boolean.TRUE, Boolean.TRUE, Boolean.TRUE},
- {"{pageContext.foo.bar.baz[\"\\\\{foo.bar.baz.nest}\"]}",
Boolean.TRUE, Boolean.TRUE, Boolean.TRUE},
-
- {"this = {pageContext.foo}'", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
- {"this = {pageContext.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
- {"this = /{pageContext.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
- {"this = \\{pageContext.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
- {"this = / {pageContext.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
- {"this = \\ {pageContext.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
- {"this = @{pageContext.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
- {"this = *{pageContext.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
- {"this = ({pageContext.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
- {"this = [{pageContext.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
- {"this = [{pageContext.foo}}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
- {"this = [{pageContext.foo}\"", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
- {"this = [{pageContext.foo}\'", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
+ {"{pageScope.foo.bar.baz[{foo.bar.baz.nest}]}", Boolean.FALSE, null,
null},
+ {"{pageScope.foo.bar.baz[\"{}\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
+ {"{pageScope.foo.bar.baz[\"{\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
+ {"{pageScope.foo.bar.baz[\"}\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
+ {"{pageScope.foo.bar.baz[\"'\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE}, // FAIL 1/4/2003 -- fixed in AttributeParser
+ {"{pageScope.foo.bar.baz[\"\\\"\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE}, // FAIL 1/4/2003 -- fixed in AttributeParser
+ {"{pageScope.foo.bar.baz[\"{foo.bar.baz}\"]}", Boolean.TRUE,
Boolean.TRUE, Boolean.TRUE},
+ {"{pageScope.foo.bar.baz[\"\\\\{foo.bar.{baz.nest}}\"]}",
Boolean.TRUE, Boolean.TRUE, Boolean.TRUE},
+ {"{pageScope.foo.bar.baz[\"\\\\{foo.bar.baz.nest}\"]}", Boolean.TRUE,
Boolean.TRUE, Boolean.TRUE},
+
+ {"this = {pageScope.foo}'", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE},
+ {"this = {pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE},
+ {"this = /{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE},
+ {"this = \\{pageScope.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
+ {"this = / {pageScope.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
+ {"this = \\ {pageScope.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
+ {"this = @{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE},
+ {"this = *{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE},
+ {"this = ({pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE},
+ {"this = [{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE},
+ {"this = [{pageScope.foo}}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
+ {"this = [{pageScope.foo}\"", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
+ {"this = [{pageScope.foo}\'", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE},
{"/{pageFlow.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE},
- {"{pageContext.foo.bar.baz['\"']}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE}, // FAIL 1/4/2003 -- fixed 05/13-2003
- {"this = '{pageContext.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE}, // FAIL 4/21/2003
- {"this = \"{pageContext.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE}, // FAIL 4/21/2003
- {"this = \'{pageContext.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE}, // FAIL 4/21/2003
+ {"{pageScope.foo.bar.baz['\"']}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE}, // FAIL 1/4/2003 -- fixed 05/13-2003
+ {"this = '{pageScope.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE}, // FAIL 4/21/2003
+ {"this = \"{pageScope.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE}, // FAIL 4/21/2003
+ {"this = \'{pageScope.foo}", Boolean.TRUE, Boolean.FALSE,
Boolean.TRUE}, // FAIL 4/21/2003
- {"{pageContext.files[\"/foo\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
- {"{pageContext.files[\"{foo\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
+ {"{pageScope.files[\"/foo\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
+ {"{pageScope.files[\"{foo\"]}", Boolean.TRUE, Boolean.TRUE,
Boolean.TRUE},
// ============================
// Broken test cases
@@ -123,7 +123,7 @@
// @bug: xscript parser -- shouldn't accept {}
//{"{}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE},
// @bug: netuiel / xscript? accepted by the latter but not the former
-- the string litreal doesn't handle \\{ but \\\\{ works
- //{"{pageContext.foo.bar.baz[\"\\{foo.bar.baz.nest}\"]}",
Boolean.TRUE, Boolean.TRUE, Boolean.TRUE},
+ //{"{pageScope.foo.bar.baz[\"\\{foo.bar.baz.nest}\"]}", Boolean.TRUE,
Boolean.TRUE, Boolean.TRUE},
// @bug: netuiel parser -- \\{ is broken in el
{"\\\\{pageFlow.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, //
FAIL 4/21/2003 -- fixed 05/13-2003
@@ -195,7 +195,7 @@
FooJavaBean bean = new FooJavaBean("JunitTestJavaBean");
_fauxPageContext.setAttribute("foo", bean);
- Object result = evaluateExpression("{pageContext.foo.textProperty}",
_fauxPageContext);
+ Object result = evaluateExpression("{pageScope.foo.textProperty}",
_fauxPageContext);
assertEquals(result, bean.getTextProperty());
}
@@ -204,25 +204,25 @@
{
Object result = null;
- result = evaluateExpression("{request.simpleBean._StringProperty}",
_fauxPageContext);
+ result =
evaluateExpression("{requestScope.simpleBean._StringProperty}",
_fauxPageContext);
assertTrue(result.equals(((SimpleTypeActionForm)_fauxPageContext.getRequest().getAttribute("simpleBean")).get_StringProperty()));
result = null;
- result = evaluateExpression("{request.simpleBean._stringProperty}",
_fauxPageContext);
+ result =
evaluateExpression("{requestScope.simpleBean._stringProperty}",
_fauxPageContext);
assertTrue(result.equals(((SimpleTypeActionForm)_fauxPageContext.getRequest().getAttribute("simpleBean")).get_stringProperty()));
}
public void testNullProperty()
throws Exception
{
- Object result =
evaluateExpression("{request.simpleBean.nullProperty}", _fauxPageContext);
+ Object result =
evaluateExpression("{requestScope.simpleBean.nullProperty}", _fauxPageContext);
assertNull(result);
}
public void testCharProperty()
throws Exception
{
- Object result =
evaluateExpression("{request.simpleBean.charProperty}", _fauxPageContext);
+ Object result =
evaluateExpression("{requestScope.simpleBean.charProperty}", _fauxPageContext);
if(!(result instanceof String && ((String)result).equals("a")))
throw new ExpressionTestError("The Character value returned from
XScript was not valid.", null);
}
@@ -241,7 +241,7 @@
boolean exception = false;
try
{
- evaluateExpression("{request.simpleBean.neverMoreProperty}",
_fauxPageContext);
+ evaluateExpression("{requestScope.simpleBean.neverMoreProperty}",
_fauxPageContext);
}
catch(Exception e)
{
@@ -259,7 +259,7 @@
try
{
- result = evaluateExpression("{request.simpleBean.StringProperty}",
_fauxPageContext);
+ result =
evaluateExpression("{requestScope.simpleBean.StringProperty}",
_fauxPageContext);
}
catch(Exception e)
{
@@ -270,7 +270,7 @@
pass = true;
try
{
- result = evaluateExpression("{request.simpleBean.stringProperty}",
_fauxPageContext);
+ result =
evaluateExpression("{requestScope.simpleBean.stringProperty}",
_fauxPageContext);
}
catch(Exception e)
{
@@ -284,25 +284,25 @@
{
Object[][] data =
{
- {"{request.complexBean.map[\" \"]}", "space"},
- {"{request.complexBean.map[\"*\"]}", "asterisk"},
- {"{request.complexBean.map[\"%\"]}", "percent"},
- {"{request.complexBean.map[\"'\"]}", "single quote"},
- {"{request.complexBean.map[\"''\"]}", "double, single quote"},
- {"{request.complexBean.map[' ']}", "space"},
- {"{request.complexBean.map['*']}", "asterisk"},
- {"{request.complexBean.map['%']}", "percent"},
+ {"{requestScope.complexBean.map[\" \"]}", "space"},
+ {"{requestScope.complexBean.map[\"*\"]}", "asterisk"},
+ {"{requestScope.complexBean.map[\"%\"]}", "percent"},
+ {"{requestScope.complexBean.map[\"'\"]}", "single quote"},
+ {"{requestScope.complexBean.map[\"''\"]}", "double, single
quote"},
+ {"{requestScope.complexBean.map[' ']}", "space"},
+ {"{requestScope.complexBean.map['*']}", "asterisk"},
+ {"{requestScope.complexBean.map['%']}", "percent"},
// @bug: netuiel -- these aren't handled
- {"{request.complexBean.map['\\'']}", "single quote"}, // how
do you do this in XScript?
- {"{request.complexBean.map['\\'\\'']}", "double, single
quote"},
- {"{request.complexBean.map['\\\"\\\"']}", "double, double
quote"},
- {"{request.complexBean.map['\\\"']}", "double quote"}, //
Radar bug: 16763 -- XScript doesn't handle this case - 02/03/2003 fixed
- {"{request.complexBean.map[\"\\\"\\\"\"]}", "double, double
quote"},
- {"{request.complexBean.map[\"\\\"\"]}", "double quote"}, //
Radar bug: 16763 -- XScript doesn't handle this case - 02/03/2003 fixed
+ {"{requestScope.complexBean.map['\\'']}", "single quote"}, //
how do you do this in XScript?
+ {"{requestScope.complexBean.map['\\'\\'']}", "double, single
quote"},
+ {"{requestScope.complexBean.map['\\\"\\\"']}", "double, double
quote"},
+ {"{requestScope.complexBean.map['\\\"']}", "double quote"}, //
Radar bug: 16763 -- XScript doesn't handle this case - 02/03/2003 fixed
+ {"{requestScope.complexBean.map[\"\\\"\\\"\"]}", "double,
double quote"},
+ {"{requestScope.complexBean.map[\"\\\"\"]}", "double quote"},
// Radar bug: 16763 -- XScript doesn't handle this case - 02/03/2003 fixed
- {"{request.complexBean.map[\"\"]}", "empty string"},
- {"{request.complexBean.map['']}", "empty string"},
+ {"{requestScope.complexBean.map[\"\"]}", "empty string"},
+ {"{requestScope.complexBean.map['']}", "empty string"},
};
int i = 0;
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
Mon Aug 2 15:53:58 2004
@@ -226,30 +226,30 @@
*/
private Object[][] writableContextData =
{
- {"{application.foo}", Boolean.FALSE},
+ {"{applicationScope.foo}", Boolean.FALSE},
{"{container.foo}", Boolean.FALSE},
- {"{pageContext.foo}", Boolean.FALSE},
- {"{request.foo}", Boolean.FALSE},
- {"{session.foo}", Boolean.FALSE},
- {"{url.foo}", Boolean.FALSE},
+ {"{pageScope.foo}", Boolean.FALSE},
+ {"{requestScope.foo}", Boolean.FALSE},
+ {"{sessionScope.foo}", Boolean.FALSE},
+ {"{param.foo}", Boolean.FALSE},
};
private Object[][] settingComplexTypeData =
{
- {"{request.myNewBean}", new SimpleTypeActionForm()},
- {"{session.anotherBean}", new ComplexTypeActionForm()},
+ {"{requestScope.myNewBean}", new SimpleTypeActionForm()},
+ {"{sessionScope.anotherBean}", new ComplexTypeActionForm()},
{"{actionForm.bigDecimal}", new
BigDecimal("1234567890.98273835093245")},
{"{actionForm.date}", new Date()},
{"{actionForm.publicBigDecimal}", new
BigDecimal("1234567890.98273835093245")},
{"{actionForm.publicDate}", new Date()},
- {"{session.complexBean}", new ComplexTypeActionForm()}, // this must
precede the next four tests
+ {"{sessionScope.complexBean}", new ComplexTypeActionForm()}, // this
must precede the next four tests
- {"{session.complexBean.bigDecimal}", new
BigDecimal("1234567890.98273835093245")},
- {"{session.complexBean.date}", new Date()},
- {"{session.complexBean.publicBigDecimal}", new
BigDecimal("1234567890.98273835093245")},
- {"{session.complexBean.publicDate}", new Date()},
+ {"{sessionScope.complexBean.bigDecimal}", new
BigDecimal("1234567890.98273835093245")},
+ {"{sessionScope.complexBean.date}", new Date()},
+ {"{sessionScope.complexBean.publicBigDecimal}", new
BigDecimal("1234567890.98273835093245")},
+ {"{sessionScope.complexBean.publicDate}", new Date()},
{"{actionForm.array[2].intWrapperProperty}", new Integer(42)},
{"{actionForm.array[2].intWrapperArrayProperty}", new Integer[] {new
Integer(42)}},
// {"{request.complexBean.array[2].intWrapperArrayProperty}", new
Integer(42)} // should this work?
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
Mon Aug 2 15:53:58 2004
@@ -33,7 +33,7 @@
{
private Object[][] _data =
{
- {"{pageContext.foo}", "pageContext"},
+ {"{pageScope.foo}", "pageScope"},
{"{pageFlow}", "pageFlow"},
{"{actionForm[42]}", "actionForm"},
{"{actionForm[\"42\"]}", "actionForm"},
