You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2011/07/13 15:39:00 UTC
svn commit: r1146014 - in /myfaces/core/branches/2.0.x/integration-tests:
servlet25-el10-basic-tests/src/main/java/org/apache/myfaces/integrationtest/
servlet25-el10-basic-tests/src/main/webapp/pages/formInput/
servlet25-el10-basic-tests/src/test/java/...
Author: jakobk
Date: Wed Jul 13 13:38:59 2011
New Revision: 1146014
URL: http://svn.apache.org/viewvc?rev=1146014&view=rev
Log:
change date handling in htmlUnit test due to locale issues on jenkins
Modified:
myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java
myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/webapp/pages/formInput/index.xhtml
myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/webapp/pages/formInput/result.xhtml
myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java
myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java
myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/webapp/pages/formInput/index.xhtml
myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/webapp/pages/formInput/result.xhtml
myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java
myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java
myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/webapp/pages/formInput/index.xhtml
myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/webapp/pages/formInput/result.xhtml
myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java
Modified: myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java?rev=1146014&r1=1146013&r2=1146014&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java (original)
+++ myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java Wed Jul 13 13:38:59 2011
@@ -21,9 +21,7 @@ package org.apache.myfaces.integrationte
import javax.faces.bean.ManagedBean;
import javax.faces.bean.RequestScoped;
import java.io.Serializable;
-import java.text.DateFormat;
import java.util.Date;
-import java.util.Locale;
/**
* Managed Bean for FormInputTest.
@@ -35,8 +33,6 @@ import java.util.Locale;
public class FormInputBean implements Serializable
{
- private static final DateFormat DATE_FORMAT = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US);
-
private String name;
private Date dateOfBirth;
private int siblings;
@@ -46,15 +42,6 @@ public class FormInputBean implements Se
return "result.xhtml";
}
- public String getFormattedDateOfBirth()
- {
- if (dateOfBirth != null)
- {
- return DATE_FORMAT.format(dateOfBirth);
- }
- return "";
- }
-
public String getName()
{
return name;
Modified: myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/webapp/pages/formInput/index.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/webapp/pages/formInput/index.xhtml?rev=1146014&r1=1146013&r2=1146014&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/webapp/pages/formInput/index.xhtml (original)
+++ myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/webapp/pages/formInput/index.xhtml Wed Jul 13 13:38:59 2011
@@ -40,7 +40,7 @@
<h:outputLabel for="dateOfBirth" value="Date of birth (e.g. 1989-03-18)" />
<h:inputText id="dateOfBirth" value="#{formInputBean.dateOfBirth}">
- <f:convertDateTime pattern="yyyy-MM-dd" locale="us" />
+ <f:convertDateTime pattern="yyyy-MM-dd" />
</h:inputText>
<h:outputLabel for="siblings" value="Number of siblings" />
Modified: myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/webapp/pages/formInput/result.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/webapp/pages/formInput/result.xhtml?rev=1146014&r1=1146013&r2=1146014&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/webapp/pages/formInput/result.xhtml (original)
+++ myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/main/webapp/pages/formInput/result.xhtml Wed Jul 13 13:38:59 2011
@@ -36,7 +36,9 @@
<h:outputText id="name" value="#{formInputBean.name}" />
<h:outputLabel for="dateOfBirth" value="Date of birth" />
- <h:outputText id="dateOfBirth" value="#{formInputBean.formattedDateOfBirth}" />
+ <h:outputText id="dateOfBirth" value="#{formInputBean.dateOfBirth}">
+ <f:convertDateTime pattern="yyyy-MM-dd" />
+ </h:outputText>
<h:outputLabel for="siblings" value="Number of siblings" />
<h:outputText id="siblings" value="#{formInputBean.siblings}" />
Modified: myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java?rev=1146014&r1=1146013&r2=1146014&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java (original)
+++ myfaces/core/branches/2.0.x/integration-tests/servlet25-el10-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java Wed Jul 13 13:38:59 2011
@@ -47,7 +47,6 @@ public class FormInputTest extends MyFac
// values
final String name = "John Doe";
final String dateOfBirth = "1976-07-12";
- final String dateOfBirthFormatted = "Jul 12, 1976";
final String siblings = "2";
// enter values
@@ -66,7 +65,7 @@ public class FormInputTest extends MyFac
HtmlElement nameElement = page.getElementById("name");
Assert.assertEquals(name, nameElement.getTextContent());
HtmlElement dateOfBirthElement = page.getElementById("dateOfBirth");
- Assert.assertEquals(dateOfBirthFormatted, dateOfBirthElement.getTextContent());
+ Assert.assertEquals(dateOfBirth, dateOfBirthElement.getTextContent());
HtmlElement siblingsElement = page.getElementById("siblings");
Assert.assertEquals(siblings, siblingsElement.getTextContent());
}
Modified: myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java?rev=1146014&r1=1146013&r2=1146014&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java (original)
+++ myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java Wed Jul 13 13:38:59 2011
@@ -21,9 +21,7 @@ package org.apache.myfaces.integrationte
import javax.faces.bean.ManagedBean;
import javax.faces.bean.RequestScoped;
import java.io.Serializable;
-import java.text.DateFormat;
import java.util.Date;
-import java.util.Locale;
/**
* Managed Bean for FormInputTest.
@@ -35,8 +33,6 @@ import java.util.Locale;
public class FormInputBean implements Serializable
{
- private static final DateFormat DATE_FORMAT = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US);
-
private String name;
private Date dateOfBirth;
private int siblings;
@@ -47,15 +43,6 @@ public class FormInputBean implements Se
return resultPage;
}
- public String getFormattedDateOfBirth()
- {
- if (dateOfBirth != null)
- {
- return DATE_FORMAT.format(dateOfBirth);
- }
- return "";
- }
-
public String getName()
{
return name;
Modified: myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/webapp/pages/formInput/index.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/webapp/pages/formInput/index.xhtml?rev=1146014&r1=1146013&r2=1146014&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/webapp/pages/formInput/index.xhtml (original)
+++ myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/webapp/pages/formInput/index.xhtml Wed Jul 13 13:38:59 2011
@@ -40,7 +40,7 @@
<h:outputLabel for="dateOfBirth" value="Date of birth (e.g. 1989-03-18)" />
<h:inputText id="dateOfBirth" value="#{formInputBean.dateOfBirth}">
- <f:convertDateTime pattern="yyyy-MM-dd" locale="us" />
+ <f:convertDateTime pattern="yyyy-MM-dd" />
</h:inputText>
<h:outputLabel for="siblings" value="Number of siblings" />
Modified: myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/webapp/pages/formInput/result.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/webapp/pages/formInput/result.xhtml?rev=1146014&r1=1146013&r2=1146014&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/webapp/pages/formInput/result.xhtml (original)
+++ myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/main/webapp/pages/formInput/result.xhtml Wed Jul 13 13:38:59 2011
@@ -36,7 +36,9 @@
<h:outputText id="name" value="#{formInputBean.name}" />
<h:outputLabel for="dateOfBirth" value="Date of birth" />
- <h:outputText id="dateOfBirth" value="#{formInputBean.formattedDateOfBirth}" />
+ <h:outputText id="dateOfBirth" value="#{formInputBean.dateOfBirth}">
+ <f:convertDateTime pattern="yyyy-MM-dd" />
+ </h:outputText>
<h:outputLabel for="siblings" value="Number of siblings" />
<h:outputText id="siblings" value="#{formInputBean.siblings}" />
Modified: myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java?rev=1146014&r1=1146013&r2=1146014&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java (original)
+++ myfaces/core/branches/2.0.x/integration-tests/servlet25-el22-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java Wed Jul 13 13:38:59 2011
@@ -47,7 +47,6 @@ public class FormInputTest extends MyFac
// values
final String name = "John Doe";
final String dateOfBirth = "1976-07-12";
- final String dateOfBirthFormatted = "Jul 12, 1976";
final String siblings = "2";
// enter values
@@ -66,7 +65,7 @@ public class FormInputTest extends MyFac
HtmlElement nameElement = page.getElementById("name");
Assert.assertEquals(name, nameElement.getTextContent());
HtmlElement dateOfBirthElement = page.getElementById("dateOfBirth");
- Assert.assertEquals(dateOfBirthFormatted, dateOfBirthElement.getTextContent());
+ Assert.assertEquals(dateOfBirth, dateOfBirthElement.getTextContent());
HtmlElement siblingsElement = page.getElementById("siblings");
Assert.assertEquals(siblings, siblingsElement.getTextContent());
}
Modified: myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java?rev=1146014&r1=1146013&r2=1146014&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java (original)
+++ myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/java/org/apache/myfaces/integrationtest/FormInputBean.java Wed Jul 13 13:38:59 2011
@@ -21,9 +21,7 @@ package org.apache.myfaces.integrationte
import javax.faces.bean.ManagedBean;
import javax.faces.bean.RequestScoped;
import java.io.Serializable;
-import java.text.DateFormat;
import java.util.Date;
-import java.util.Locale;
/**
* Managed Bean for FormInputTest.
@@ -35,8 +33,6 @@ import java.util.Locale;
public class FormInputBean implements Serializable
{
- private static final DateFormat DATE_FORMAT = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US);
-
private String name;
private Date dateOfBirth;
private int siblings;
@@ -47,15 +43,6 @@ public class FormInputBean implements Se
return resultPage;
}
- public String getFormattedDateOfBirth()
- {
- if (dateOfBirth != null)
- {
- return DATE_FORMAT.format(dateOfBirth);
- }
- return "";
- }
-
public String getName()
{
return name;
Modified: myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/webapp/pages/formInput/index.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/webapp/pages/formInput/index.xhtml?rev=1146014&r1=1146013&r2=1146014&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/webapp/pages/formInput/index.xhtml (original)
+++ myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/webapp/pages/formInput/index.xhtml Wed Jul 13 13:38:59 2011
@@ -40,7 +40,7 @@
<h:outputLabel for="dateOfBirth" value="Date of birth (e.g. 1989-03-18)" />
<h:inputText id="dateOfBirth" value="#{formInputBean.dateOfBirth}">
- <f:convertDateTime pattern="yyyy-MM-dd" locale="us" />
+ <f:convertDateTime pattern="yyyy-MM-dd" />
</h:inputText>
<h:outputLabel for="siblings" value="Number of siblings" />
Modified: myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/webapp/pages/formInput/result.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/webapp/pages/formInput/result.xhtml?rev=1146014&r1=1146013&r2=1146014&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/webapp/pages/formInput/result.xhtml (original)
+++ myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/main/webapp/pages/formInput/result.xhtml Wed Jul 13 13:38:59 2011
@@ -36,7 +36,9 @@
<h:outputText id="name" value="#{formInputBean.name}" />
<h:outputLabel for="dateOfBirth" value="Date of birth" />
- <h:outputText id="dateOfBirth" value="#{formInputBean.formattedDateOfBirth}" />
+ <h:outputText id="dateOfBirth" value="#{formInputBean.dateOfBirth}">
+ <f:convertDateTime pattern="yyyy-MM-dd" />
+ </h:outputText>
<h:outputLabel for="siblings" value="Number of siblings" />
<h:outputText id="siblings" value="#{formInputBean.siblings}" />
Modified: myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java?rev=1146014&r1=1146013&r2=1146014&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java (original)
+++ myfaces/core/branches/2.0.x/integration-tests/servlet30-el22-basic-tests/src/test/java/org/apache/myfaces/integrationtest/FormInputTest.java Wed Jul 13 13:38:59 2011
@@ -47,7 +47,6 @@ public class FormInputTest extends MyFac
// values
final String name = "John Doe";
final String dateOfBirth = "1976-07-12";
- final String dateOfBirthFormatted = "Jul 12, 1976";
final String siblings = "2";
// enter values
@@ -66,7 +65,7 @@ public class FormInputTest extends MyFac
HtmlElement nameElement = page.getElementById("name");
Assert.assertEquals(name, nameElement.getTextContent());
HtmlElement dateOfBirthElement = page.getElementById("dateOfBirth");
- Assert.assertEquals(dateOfBirthFormatted, dateOfBirthElement.getTextContent());
+ Assert.assertEquals(dateOfBirth, dateOfBirthElement.getTextContent());
HtmlElement siblingsElement = page.getElementById("siblings");
Assert.assertEquals(siblings, siblingsElement.getTextContent());
}