[gatein-commits] gatein SVN: r4351 - epp/portal/branches/EPP_5_1_Branch/component/scripting/src/test/java/org/exoplatform/groovyscript.
Author: thomas.heute(a)jboss.com
Date: 2010-09-23 07:09:32 -0400 (Thu, 23 Sep 2010)
New Revision: 4351
Modified:
epp/portal/branches/EPP_5_1_Branch/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java
Log:
JBEPP-505: Fix TestTemplateRendering.java testcase
Modified:
epp/portal/branches/EPP_5_1_Branch/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java
===================================================================
---
epp/portal/branches/EPP_5_1_Branch/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java 2010-09-23
11:07:03 UTC (rev 4350)
+++
epp/portal/branches/EPP_5_1_Branch/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java 2010-09-23
11:09:32 UTC (rev 4351)
@@ -24,6 +24,8 @@
import java.awt.*;
import java.io.*;
+import java.text.DateFormat;
+import java.util.Date;
import java.util.EmptyStackException;
import java.util.HashMap;
import java.util.Locale;
@@ -36,6 +38,19 @@
public class TestTemplateRendering extends AbstractGateInTest
{
+ private DateFormat dateFormatFR;
+ private DateFormat dateFormatEN;
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ // TODO Auto-generated method stub
+ super.setUp();
+
+ dateFormatFR = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.FRANCE);
+ dateFormatEN = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.ENGLISH);
+ }
+
public void testOutputStreamWriter() throws Exception
{
GroovyTemplate template = new
GroovyTemplate("a<%='b'%>c<%out.print('d');%>e");
@@ -48,28 +63,31 @@
public void testDate1() throws Exception
{
+ Date dateToTest = new Date(0);
GroovyTemplate template = new GroovyTemplate("<% print(new Date(0));
%>");
- assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
- assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
- assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ assertEquals(dateFormatFR.format(dateToTest), template.render(Locale.FRENCH));
+ assertEquals(dateFormatEN.format(dateToTest), template.render(Locale.ENGLISH));
+ assertEquals(dateToTest.toString(), template.render());
}
public void testDate2() throws Exception
{
+ Date dateToTest = new Date(0);
GroovyTemplate template = new GroovyTemplate("<% def date = new Date(0)
%>$date");
System.out.println("template.getGroovy() = " + template.getGroovy());
- assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
- assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
- assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ assertEquals(dateFormatFR.format(dateToTest), template.render(Locale.FRENCH));
+ assertEquals(dateFormatEN.format(dateToTest), template.render(Locale.ENGLISH));
+ assertEquals(dateToTest.toString(), template.render());
}
public void testDate3() throws Exception
{
+ Date dateToTest = new Date(0);
GroovyTemplate template = new GroovyTemplate("<%= new Date(0)
%>");
System.out.println("template.getGroovy() = " + template.getGroovy());
- assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
- assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
- assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ assertEquals(dateFormatFR.format(dateToTest), template.render(Locale.FRENCH));
+ assertEquals(dateFormatEN.format(dateToTest), template.render(Locale.ENGLISH));
+ assertEquals(dateToTest.toString(), template.render());
}
public void testFoo() throws Exception