Index: suite.jelly
===================================================================
RCS file: /home/cvspublic/jakarta-commons-sandbox/jelly/jelly-tags/fmt/src/test/org/apache/commons/jelly/tags/fmt/suite.jelly,v
retrieving revision 1.1
diff -r1.1 suite.jelly
4a5
> 			xmlns:b="jelly:beanshell" 

12c13,15
< 			<fmt:message var="dummyKey2">${keyvar}</fmt:message>

---
> 			<fmt:message trim="true" var="dummyKey2">

> 				${keyvar}

> 			</fmt:message>

15,20c18
< 

< 		<m:echo>i10n content is </m:echo>

< 		<m:echo>key1: '${dummyKey1}'</m:echo>

< 		<m:echo>key2: '${dummyKey2}'</m:echo>

< 		<m:echo>keyInvalid: '${dummyKeyInvalid}'</m:echo>

<     

---
> 		    

35,37d32
< 		<m:echo>i10n content is </m:echo>

< 		<m:echo>key3: '${dummyKey3}'</m:echo>

<     

48,52d42
< 

< 		<m:echo>i10n content is </m:echo>

< 		<m:echo>key1: '${dummyKey1}'</m:echo>

< 		<m:echo>key2: '${dummyKey2}'</m:echo>

< 		<m:echo>keyInvalid: '${dummyKeyInvalid}'</m:echo>

66,70d55
< 

< 		<m:echo>i10n content is </m:echo>

< 		<m:echo>key1: '${dummyKey1}'</m:echo>

< 		<m:echo>key2: '${dummyKey2}'</m:echo>

< 		<m:echo>keyInvalid: '${dummyKeyInvalid}'</m:echo>

76c61,115
< </test:suite>

---
> 	

> 	<test:case name="testSetBundle" xmlns="dummy">

> 		<fmt:bundle basename="org.apache.commons.jelly.tags.fmt.xyz" prefix="123.">

> 			<fmt:message key="key1" var="xyz1"/>

> 		</fmt:bundle>

> 		

> 		<fmt:setBundle basename="org.apache.commons.jelly.tags.fmt.xyz"/>

> 		<fmt:message key="123.key1" var="xyz2"/>

> 		

> 		<fmt:bundle basename="org.apache.commons.jelly.tags.fmt.abc">

> 			<fmt:message key="key1" var="abc1"/>

> 		</fmt:bundle>

> 		<fmt:setBundle basename="org.apache.commons.jelly.tags.fmt.abc" var="abcbundle"/>

> 		<fmt:message key="key1" bundle="${abcbundle}" var="abc2"/>

> 				    

> 		<test:assertEquals expected="${xyz1}" actual="${xyz2}" />

> 		<test:assertEquals expected="${abc1}" actual="${abc2}" />

> 	</test:case>

> 	

> 	<test:case name="testTimeZone" xmlns="dummy">

> 		<b:script>

> 			context.setVariable("cal", java.util.Calendar.getInstance());

> 			context.getVariable("cal").setTimeZone(java.util.TimeZone.getTimeZone("GMT"));

> 			context.getVariable("cal").set(2003, 0, 1, 1, 20, 30);

> 			context.setVariable("adate", context.getVariable("cal").getTime());

> 		</b:script>

> 		

> 		<fmt:setLocale value="en"/>

> 		<fmt:timeZone value="GMT">

> 			<fmt:formatDate var="f1" value="${adate}" type="both" timeStyle="full"/>

> 		</fmt:timeZone>

> 		<fmt:timeZone value="GMT-03:00">

> 			<fmt:formatDate var="f2" value="${adate}" type="both" timeStyle="full"/>

> 			<fmt:formatDate var="f2_2" value="${adate}" 

> 				type="both" timeStyle="full" pattern="yyyyMMddkkmmssmsZ"/>

> 		</fmt:timeZone>

> 		<fmt:formatDate var="f2_3" value="${adate}" 

> 				type="both" timeStyle="full" pattern="yyyyMMddkkmmssmsZ" timeZone="GMT-03:00"/>

> 		<fmt:timeZone value="GMT+10:00">

> 			<fmt:formatDate var="f3" value="${adate}" type="both" timeStyle="full"/>

> 			<fmt:formatDate var="f3_2" value="${adate}" 

> 				type="both" timeStyle="full" pattern="yyyyMMddhhmmssmsaZ"/>

> 		</fmt:timeZone>

> 		<fmt:formatDate var="f3_3" value="${adate}" 

> 				type="both" timeStyle="full" pattern="yyyyMMddhhmmssmsaZ" timeZone="GMT+10:00"/>

> 

> 		<test:assertEquals expected="Jan 1, 2003 1:20:30 AM GMT" actual="${f1}" />

> 		<test:assertEquals expected="Dec 31, 2002 10:20:30 PM GMT-03:00" actual="${f2}" />

> 		<test:assertEquals expected="200212312220302030-0300" actual="${f2_2}" />

> 		<test:assertEquals expected="${f2_2}" actual="${f2_3}" />

> 		<test:assertEquals expected="Jan 1, 2003 11:20:30 AM GMT+10:00" actual="${f3}" />

> 		<test:assertEquals expected="200301011120302030AM+1000" actual="${f3_2}" />

> 		<test:assertEquals expected="${f3_2}" actual="${f3_3}" />

> 	</test:case>

> </test:suite>