Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ public void positiveSetSelectVarTest() throws Exception {
* @assertion_ids: JSTL:SPEC:57.1; JSTL:SPEC:57.1.1; JSTL:SPEC:57.1.2; JSTL:SPEC:57.1.3
*
* @testStrategy: Validate that the value attribute can accept both static values as well as three letter timezones (ex.
* PST) or fully qualified values (ex. America/Los_Angeles).
* America/Los_Angeles).
*/
@Test
public void positiveSetTimezoneValueTest() throws Exception {
Expand All @@ -779,7 +779,7 @@ public void positiveSetTimezoneValueTest() throws Exception {
* @assertion_ids: JSTL:SPEC:57.1; JSTL:SPEC:57.1.1; JSTL:SPEC:57.1.2; JSTL:SPEC:57.1.3
*
* @testStrategy: Validate that the value attribute can accept both static values as well as three letter timezones (ex.
* PST) or fully qualified values (ex. America/Los_Angeles).
* America/Los_Angeles).
*/
@Test
public void positiveTimezoneValueTest() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ public void positiveFDValueNullTest() throws Exception {
* @assertion_ids: JSTL:SPEC:57.11
*
* @testStrategy: Validate that if timeZone is null or empty, the value will be formatted as if it was present. In this
* case, the time will be formatted using the page's time zone of EST.
* case, the time will be formatted using the page's time zone of America/New_York.
*/
@Test
public void positiveFDTimeZoneNullEmptyTest() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ public void positivePDTimeZoneTest() throws Exception {
* @assertion_ids: JSTL:SPEC:58.25
*
* @testStrategy: Validate that if timeZone is null or empty, the value will be formatted as if it was missing. In this
* case, the time will be formatted using the page's time zone of EST. Pass the parsed value to formatDate to display
* case, the time will be formatted using the page's time zone of America/New_York. Pass the parsed value to formatDate to display
* (due to possible timezone difference).
*/
@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public static WebArchive createDeployment() throws IOException {
* JSTL:SPEC:93.1.5; JSTL:SPEC:93.1.6
*
* @testStrategy: Validate that the value attribute can accept dynamic values as well as three letter timezones (ex.
* PST) or fully qualified values (ex. America/Los_Angeles).
* America/Los_Angeles).
*/
@Test
public void positiveSetTimezoneValueTest() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static WebArchive createDeployment() throws IOException {
* @assertion_ids: JSTL:SPEC:54; JSTL:SPEC:54.1; JSTL:SPEC:54.1.1; JSTL:SPEC:54.1.2; JSTL:SPEC:54.1.3
*
* @testStrategy: Validate that the value attribute can accept both static values as well as three letter timezones (ex.
* PST) or fully qualified values (ex. America/Los_Angeles).
* America/Los_Angeles).
*/
@Test
public void positiveTimezoneValueTest() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
pageContext.setAttribute("dte", date);
%>
<fmt:setLocale value="en_US"/>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>
<!-- EL: Validate the the action can properly format a date
Date -->
<fmt:formatDate value="${dte}"/><br>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
Date date = new Date(883192294202L);
pageContext.setAttribute("dte", date);
%>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>
<fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.Resources1"/>
<fmt:setLocale value="de_DE"/>
<c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
Date date = new Date(883192294202L);
pageContext.setAttribute("dte", date);
%>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>
<fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.Resources1"/>
<fmt:setLocale value="de_DE"/>
<c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<tck:test testName="positivePDValueTest">
<c:set var="dte" value="Nov 21, 2000"/>
<fmt:setLocale value="en_US"/>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>
<!-- EL: Validate the the action can properly parse a date
provided as a dynamic or static value. -->
<fmt:parseDate value="${dte}" var="e1"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
<%@ page import="java.util.TimeZone,java.util.Date" %>
<tck:test testName="positiveTimezoneValueTest">
<%
TimeZone tz = TimeZone.getTimeZone("PST");
TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles");
pageContext.setAttribute("tz", tz);
Date date = new Date(883192294202L);
pageContext.setAttribute("dte", date);
%>
<c:set var="mtz" value="PST"/>
<c:set var="mtz" value="America/Los_Angeles"/>
<!-- EL: Behavioral test of value attribute -->
<!-- Timezone object -->
<fmt:setTimeZone value="${tz}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
<%@ page import="java.util.TimeZone,java.util.Date" %>
<tck:test testName="positiveTimezoneValueTest">
<%
TimeZone tz = TimeZone.getTimeZone("PST");
TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles");
pageContext.setAttribute("tz", tz);
Date date = new Date(883192294202L);
pageContext.setAttribute("dte", date);
%>
<c:set var="mtz" value="PST"/>
<c:set var="mtz" value="America/Los_Angeles"/>
<!-- EL: Behavioral test of value attribute -->
<!-- Timezone object -->
<fmt:timeZone value="${tz}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<c:set var="lon" value="long"/>
<c:set var="ful" value="full"/>
<fmt:setLocale value="en_US"/>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>

<!-- dateStyle specifies what date style the formated value
will be returned in. This will only be applied
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
Date date = new Date(883192294202L);
pageContext.setAttribute("dte", date);
%>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>
<tck:config op="set" configVar="fallback" value="en-US"/>
<!-- The fallbackLocale configuration variable will be
used if no locale match can be determined. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
Date date = new Date(883192294202L);
pageContext.setAttribute("dte", date);
%>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>
<fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.Resources"/>

<!-- Validate that the action is able to dermine the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
%>
<c:set var="pat" value="yyyy.MM.dd G 'at' HH:mm:ss z"/>
<fmt:setLocale value="en_US"/>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>

<!-- the pattern attribute specifies a custom pattern
to be applied when formatting the provided date. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
pageContext.setAttribute("dte", date);
%>
<fmt:setLocale value="en_US"/>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>

<!-- The presence of the scope attribute will cause var to be
exported to the available scopes of the PageContext.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<c:set var="lon" value="long"/>
<c:set var="ful" value="full"/>
<fmt:setLocale value="en_US"/>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>

<!-- timeStyle specifies what time style the formated value
will be returned in. This will only be applied
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
pageContext.setAttribute("dte", date);
%>
<fmt:setLocale value="en_US"/>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>

<!-- If timeZone is null or empty, it will be treated as
if it was not present. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
value.
- Use the value of the scoped attribute
jakarta.servlet.jsp.jstl.fmt.timeZone. -->
<br>TimeZone attribute specified with a value of PST:<br>
Wrapped by &lt;fmt:timeZone&gt; action with MST. Time should be 7:11:34 PM:<br>
<br>TimeZone attribute specified with a value of America/Los_Angeles:<br>
Wrapped by &lt;fmt:timeZone&gt; action with America/Denver. Time should be 7:11:34 PM:<br>

Dec 26, 1997, 7:11:34 PM<br>


Not wrapped. Page has a time zone of EST. Time should be 7:11:34 PM<br>
Not wrapped. Page has a time zone of America/New_York. Time should be 7:11:34 PM<br>
Dec 26, 1997, 7:11:34 PM<br>

<br>No TimeZone attribute specified:<br>
Wrapped by &lt;fmt:timeZone&gt; action with MST. Time should be 8:11:34 PM:<br>
Wrapped by &lt;fmt:timeZone&gt; action with America/Denver. Time should be 8:11:34 PM:<br>

Dec 26, 1997, 8:11:34 PM<br>


Not wrapped. Page has a time zone of EST. Time should be 10:11:34 PM<br>
Not wrapped. Page has a time zone of America/New_York. Time should be 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
<br>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
Date date = new Date(883192294202L);
pageContext.setAttribute("dte", date);
%>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>
<fmt:setLocale value="en_US"/>

<!-- The time zone to be used when formatting operates
Expand All @@ -37,22 +37,22 @@
value.
- Use the value of the scoped attribute
jakarta.servlet.jsp.jstl.fmt.timeZone. -->
<br>TimeZone attribute specified with a value of PST:<br>
Wrapped by &lt;fmt:timeZone&gt; action with MST. Time should be 7:11:34 PM:<br>
<fmt:timeZone value="MST">
<fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>' timeZone="PST" type="both"/><br>
<br>TimeZone attribute specified with a value of America/Los_Angeles:<br>
Wrapped by &lt;fmt:timeZone&gt; action with America/Denver. Time should be 7:11:34 PM:<br>
<fmt:timeZone value="America/Denver">
<fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>' timeZone="America/Los_Angeles" type="both"/><br>
</fmt:timeZone>

Not wrapped. Page has a time zone of EST. Time should be 7:11:34 PM<br>
<fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>' timeZone="PST" type="both"/><br>
Not wrapped. Page has a time zone of America/New_York. Time should be 7:11:34 PM<br>
<fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>' timeZone="America/Los_Angeles" type="both"/><br>

<br>No TimeZone attribute specified:<br>
Wrapped by &lt;fmt:timeZone&gt; action with MST. Time should be 8:11:34 PM:<br>
<fmt:timeZone value="MST">
Wrapped by &lt;fmt:timeZone&gt; action with America/Denver. Time should be 8:11:34 PM:<br>
<fmt:timeZone value="America/Denver">
<fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>' type="both"/><br>
</fmt:timeZone>

Not wrapped. Page has a time zone of EST. Time should be 10:11:34 PM<br>
Not wrapped. Page has a time zone of America/New_York. Time should be 10:11:34 PM<br>
<fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>' type="both"/><br>
<br>
</tck:test>
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
value.
- Use the value of the scoped attribute
jakarta.servlet.jsp.jstl.fmt.timeZone. -->
<br>TimeZone attribute specified with a value of PST:<br>
Wrapped by &lt;fmt:timeZone&gt; action with MST. Time should be 7:11:34 PM:<br>
<br>TimeZone attribute specified with a value of America/Los_Angeles:<br>
Wrapped by &lt;fmt:timeZone&gt; action with America/Denver. Time should be 7:11:34 PM:<br>

Dec 26, 1997, 7:11:34 PM<br>


Not wrapped. Page has a time zone of EST. Time should be 7:11:34 PM<br>
Not wrapped. Page has a time zone of America/New_York. Time should be 7:11:34 PM<br>
Dec 26, 1997, 7:11:34 PM<br>

<br>No TimeZone attribute specified:<br>
Wrapped by &lt;fmt:timeZone&gt; action with MST. Time should be 8:11:34 PM:<br>
Wrapped by &lt;fmt:timeZone&gt; action with America/Denver. Time should be 8:11:34 PM:<br>

Dec 26, 1997, 8:11:34 PM<br>


Not wrapped. Page has a time zone of EST. Time should be 10:11:34 PM<br>
Not wrapped. Page has a time zone of America/New_York. Time should be 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
<br>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<!-- The time zone to be applied to the formatted value can be explicitly provided to the action. This will effectively
overried the timezone of the page -->
<br>Page is using EST for the timezone. The formatting action will use PST. Value should be minus 3 hours.<br>
<br>Page is using America/New_York for the timezone. The formatting action will use America/Los_Angeles. Value should be minus 3 hours.<br>
No timeZone attribute: Dec 26, 1997, 10:11:34 PM<br>
Dec 26, 1997, 7:11:34 PM<br>
Dec 26, 1997, 7:11:34 PM<br>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@
<%
Date date = new Date(883192294202L);
pageContext.setAttribute("dte", date);
pageContext.setAttribute("tz", TimeZone.getTimeZone("PST"));
pageContext.setAttribute("tz", TimeZone.getTimeZone("America/Los_Angeles"));
%>
<fmt:setLocale value="en_US"/>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>

<!-- The time zone to be applied to the formatted value can
be explicitly provided to the action. This will effectively
overried the timezone of the page -->
<br>Page is using EST for the timezone. The formatting action will use PST. Value should be minus 3 hours.<br>
<br>Page is using America/New_York for the timezone. The formatting action will use America/Los_Angeles. Value should be minus 3 hours.<br>
No timeZone attribute: <fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>' type="both"/><br>
<fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>'
timeZone='<%= (TimeZone) pageContext.getAttribute("tz") %>' type="both"/><br>
<fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>'
timeZone="PST" type="both"/><br>
timeZone="America/Los_Angeles" type="both"/><br>
</tck:test>
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<!-- The time zone to be applied to the formatted value can be explicitly provided to the action. This will effectively
overried the timezone of the page -->
<br>Page is using EST for the timezone. The formatting action will use PST. Value should be minus 3 hours.<br>
<br>Page is using America/New_York for the timezone. The formatting action will use America/Los_Angeles. Value should be minus 3 hours.<br>
No timeZone attribute: Dec 26, 1997, 10:11:34 PM<br>
Dec 26, 1997, 7:11:34 PM<br>
Dec 26, 1997, 7:11:34 PM<br>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<c:set var="dat" value="date"/>
<c:set var="bot" value="both"/>
<fmt:setLocale value="en_US"/>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>

<!-- the type attribute specifies if either the time or date
or both components of the provided date value will
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<%@ taglib prefix="tck" uri="http://java.sun.com/jstltck/jstltck-util" %>
<tck:test testName="positiveFDValueNullEmptyTest">
<fmt:setLocale value="en_US"/>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>

<!-- If value is null and var (or scope and var) is specified,
the scoped variable identified by var is removed. If
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
Date date = new Date(883192294202L);
%>
<fmt:setLocale value="en_US"/>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>

<!-- Validate the the action can properly format a date
Date -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
Date date = new Date(883192294202L);
pageContext.setAttribute("dte", date);
%>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>
<c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>

<!-- If the action is not wrapped in a fmt:bundle action,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
Date date = new Date(883192294202L);
pageContext.setAttribute("dte", date);
%>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>
<c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>

<!-- If the action is not wrapped in a fmt:bundle action,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
Date date = new Date(883192294202L);
pageContext.setAttribute("dte", date);
%>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>
<fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.AlgoResources6"/>
<c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
Date date = new Date(883192294202L);
pageContext.setAttribute("dte", date);
%>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>
<fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.AlgoResources6"/>
<c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
Date date = new Date(883192294202L);
pageContext.setAttribute("dte", date);
%>
<fmt:setTimeZone value="EST"/>
<fmt:setTimeZone value="America/New_York"/>
<fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.Resources1"/>
<fmt:setLocale value="de_DE"/>
<c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
Expand Down
Loading