Author: niallp
Date: Tue Mar 6 10:17:51 2007
New Revision: 515237
URL: http://svn.apache.org/viewvc?view=rev&rev=515237
Log:
Add a test case to demonstrate Jira Isssue STR-2802
Modified:
struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/PojoBean.java
struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/TestValidWhen.java
Modified:
struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/PojoBean.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/PojoBean.java?view=diff&rev=515237&r1=515236&r2=515237
==============================================================================
---
struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/PojoBean.java
(original)
+++
struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/PojoBean.java
Tue Mar 6 10:17:51 2007
@@ -35,6 +35,7 @@
protected Integer integerValue2;
protected PojoBean[] beans;
protected Map map = new HashMap();
+ protected String[] stringArray;
/**
* Default Constructor
@@ -86,6 +87,27 @@
*/
public String getStringValue2() {
return stringValue2;
+ }
+
+ /**
+ * Set the stringArray.
+ */
+ public void setStringArray(String[] stringArray) {
+ this.stringArray = stringArray;
+ }
+
+ /**
+ * Return stringArray.
+ */
+ public String[] getStringArray() {
+ return stringArray;
+ }
+
+ /**
+ * Return Indexed value for stringArray.
+ */
+ public String getStringArray(int index) {
+ return stringArray[index];
}
/**
Modified:
struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/TestValidWhen.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/TestValidWhen.java?view=diff&rev=515237&r1=515236&r2=515237
==============================================================================
---
struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/TestValidWhen.java
(original)
+++
struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/TestValidWhen.java
Tue Mar 6 10:17:51 2007
@@ -78,6 +78,7 @@
new PojoBean(41, 52), new PojoBean(51, 62)
});
testBean.setMapped("testKey", "mappedValue");
+ testBean.setStringArray(new String[] {"zero", "one", "two", "three"});
}
public void tearDown() {
@@ -222,6 +223,25 @@
"stringValue1", false);
doParse("((*this* != 'ABC') and (stringValue2 != null))", testBean, 0,
"stringValue1", false);
+ }
+
+ /**
+ * Test Indexed Property.
+ */
+ public void testIndexedValue() {
+
+ // Test Case for Jira Issue STR-2802
+ // see https://issues.apache.org/struts/browse/STR-2802
+ //
+ // Currently validwhen is throwing an exception when using
+ // the "indexed" syntax - this test case is to help resolve
+ // that - logging the exception
+ //
+ try {
+ doParse("(stringArray[1] == 'one')", testBean, 1,
"stringArray[1]");
+ } catch(Exception e) {
+ log.error("TestValidWhen.testIndexedValue() threw exception", e);
+ }
}
/**
