You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2022/11/03 08:58:25 UTC
[myfaces-tobago] 02/02: test(date): fix IDs
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit e5732918b941e57eb65ddf71601ab6aff14c63a2
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Nov 3 09:42:42 2022 +0100
test(date): fix IDs
---
.../webapp/content/900-test/1100-date/Date.test.js | 77 ++++++++++------------
.../webapp/content/900-test/1100-date/Date.xhtml | 48 +++++++-------
2 files changed, 58 insertions(+), 67 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1100-date/Date.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1100-date/Date.test.js
index 7f702f088e..625466b257 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1100-date/Date.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1100-date/Date.test.js
@@ -19,15 +19,14 @@ import {querySelectorFn} from "/script/tobago-test.js";
import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
it("#1 model=java.time.LocalDate", function (done) {
- let inputFieldFn = querySelectorFn("#page\\:mainForm\\:j_id_2f\\:localDate\\:\\:field");
- let outPutFn = querySelectorFn("#page\\:mainForm\\:j_id_2f\\:j_id_2i .form-control-plaintext");
- let submitButtonFn = querySelectorFn("#page\\:mainForm\\:j_id_2f\\:localDateButton");
- let resetButtonFn = querySelectorFn("#page\\:mainForm\\:j_id_2c\\:j_id_2d");
+ const inputFieldFn = querySelectorFn("#page\\:mainForm\\:localDateForm\\:localDate\\:\\:field");
+ const outPutFn = querySelectorFn("#page\\:mainForm\\:localDateForm\\:localDateOutput .form-control-plaintext");
+ const submitButtonFn = querySelectorFn("#page\\:mainForm\\:localDateForm\\:localDateButton");
+ const resetButtonFn = querySelectorFn("#page\\:mainForm\\:resetButtonFrom\\:resetButton");
const date = "2020-07-07";
const test = new JasmineTestTool(done);
- test.setup(() => outPutFn().textContent !== null,
- null, "click", resetButtonFn);
+ test.setup(() => outPutFn().textContent !== null, null, "click", resetButtonFn);
test.do(() => inputFieldFn().value = date);
test.event("click", submitButtonFn, () => outPutFn().textContent !== "");
test.do(() => expect(outPutFn().textContent === date));
@@ -35,15 +34,14 @@ it("#1 model=java.time.LocalDate", function (done) {
});
it("#2 model=java.time.LocalTime", function (done) {
- let inputFieldFn = querySelectorFn("#page\\:mainForm\\:j_id_2k\\:localTime\\:\\:field");
- let outPutFn = querySelectorFn("#page\\:mainForm\\:j_id_2k\\:j_id_2n .form-control-plaintext");
- let submitButtonFn = querySelectorFn("#page\\:mainForm\\:j_id_2k\\:localTimeButton");
- let resetButtonFn = querySelectorFn("#page\\:mainForm\\:j_id_2c\\:j_id_2d");
+ const inputFieldFn = querySelectorFn("#page\\:mainForm\\:localTimeForm\\:localTime\\:\\:field");
+ const outPutFn = querySelectorFn("#page\\:mainForm\\:localTimeForm\\:localTimeOutput .form-control-plaintext");
+ const submitButtonFn = querySelectorFn("#page\\:mainForm\\:localTimeForm\\:localTimeButton");
+ const resetButtonFn = querySelectorFn("#page\\:mainForm\\:resetButtonFrom\\:resetButton");
const time = "07:07";
const test = new JasmineTestTool(done);
- test.setup(() => outPutFn().textContent !== null,
- null, "click", resetButtonFn);
+ test.setup(() => outPutFn().textContent !== null, null, "click", resetButtonFn);
test.do(() => inputFieldFn().value = time);
test.event("click", submitButtonFn, () => outPutFn().textContent !== "");
test.do(() => expect(outPutFn().textContent === time));
@@ -51,15 +49,14 @@ it("#2 model=java.time.LocalTime", function (done) {
});
it("#3 model=java.time.LocalTime step=1", function (done) {
- let inputFieldFn = querySelectorFn("#page\\:mainForm\\:j_id_2p\\:localTimeStepA\\:\\:field");
- let outPutFn = querySelectorFn("#page\\:mainForm\\:j_id_2p\\:j_id_2s .form-control-plaintext");
- let submitButtonFn = querySelectorFn("#page\\:mainForm\\:j_id_2p\\:localTimeButtonStepA");
- let resetButtonFn = querySelectorFn("#page\\:mainForm\\:j_id_2c\\:j_id_2d");
+ const inputFieldFn = querySelectorFn("#page\\:mainForm\\:localTimeStepAForm\\:localTimeStepA\\:\\:field");
+ const outPutFn = querySelectorFn("#page\\:mainForm\\:localTimeStepAForm\\:localTimeStepAOutput .form-control-plaintext");
+ const submitButtonFn = querySelectorFn("#page\\:mainForm\\:localTimeStepAForm\\:localTimeButtonStepA");
+ const resetButtonFn = querySelectorFn("#page\\:mainForm\\:resetButtonFrom\\:resetButton");
const time = "07:07:07";
const test = new JasmineTestTool(done);
- test.setup(() => outPutFn().textContent !== null,
- null, "click", resetButtonFn);
+ test.setup(() => outPutFn().textContent !== null, null, "click", resetButtonFn);
test.do(() => inputFieldFn().value = time);
test.event("click", submitButtonFn, () => outPutFn().textContent !== "");
test.do(() => expect(outPutFn().textContent === time));
@@ -67,15 +64,14 @@ it("#3 model=java.time.LocalTime step=1", function (done) {
});
it("#4 model=java.time.LocalTime step=0.001", function (done) {
- let inputFieldFn = querySelectorFn("#page\\:mainForm\\:j_id_2u\\:localTimeStepB\\:\\:field");
- let outPutFn = querySelectorFn("#page\\:mainForm\\:j_id_2u\\:j_id_2x .form-control-plaintext");
- let submitButtonFn = querySelectorFn("#page\\:mainForm\\:j_id_2u\\:localTimeButtonStepB");
- let resetButtonFn = querySelectorFn("#page\\:mainForm\\:j_id_2c\\:j_id_2d");
+ const inputFieldFn = querySelectorFn("#page\\:mainForm\\:localTimeStepBForm\\:localTimeStepB\\:\\:field");
+ const outPutFn = querySelectorFn("#page\\:mainForm\\:localTimeStepBForm\\:localTimeStepBOutput .form-control-plaintext");
+ const submitButtonFn = querySelectorFn("#page\\:mainForm\\:localTimeStepBForm\\:localTimeButtonStepB");
+ const resetButtonFn = querySelectorFn("#page\\:mainForm\\:resetButtonFrom\\:resetButton");
const time = "07:07:07.007";
const test = new JasmineTestTool(done);
- test.setup(() => outPutFn().textContent !== null,
- null, "click", resetButtonFn);
+ test.setup(() => outPutFn().textContent !== null, null, "click", resetButtonFn);
test.do(() => inputFieldFn().value = time);
test.event("click", submitButtonFn, () => outPutFn().textContent !== "");
test.do(() => expect(outPutFn().textContent === time));
@@ -83,15 +79,14 @@ it("#4 model=java.time.LocalTime step=0.001", function (done) {
});
it("#5 model=java.time.LocalDateTime", function (done) {
- let inputFieldFn = querySelectorFn("#page\\:mainForm\\:j_id_2z\\:localDateTime\\:\\:field");
- let outPutFn = querySelectorFn("#page\\:mainForm\\:j_id_2z\\:j_id_32 .form-control-plaintext");
- let submitButtonFn = querySelectorFn("#page\\:mainForm\\:j_id_2z\\:localDateTimeButton");
- let resetButtonFn = querySelectorFn("#page\\:mainForm\\:j_id_2z\\:j_id_2d");
+ const inputFieldFn = querySelectorFn("#page\\:mainForm\\:localDateTimeForm\\:localDateTime\\:\\:field");
+ const outPutFn = querySelectorFn("#page\\:mainForm\\:localDateTimeForm\\:localDateTimeOutput .form-control-plaintext");
+ const submitButtonFn = querySelectorFn("#page\\:mainForm\\:localDateTimeForm\\:localDateTimeButton");
+ const resetButtonFn = querySelectorFn("#page\\:mainForm\\:resetButtonFrom\\:resetButton");
const time = "2020-07-07T07:07";
const test = new JasmineTestTool(done);
- test.setup(() => outPutFn().textContent !== null,
- null, "click", resetButtonFn);
+ test.setup(() => outPutFn().textContent !== null, null, "click", resetButtonFn);
test.do(() => inputFieldFn().value = time);
test.event("click", submitButtonFn, () => outPutFn().textContent !== "");
test.do(() => expect(outPutFn().textContent === time));
@@ -99,15 +94,14 @@ it("#5 model=java.time.LocalDateTime", function (done) {
});
it("#6 model=java.time.LocalDateTime step=1", function (done) {
- let inputFieldFn = querySelectorFn("#page\\:mainForm\\:j_id_34\\:localDateTimeStepA\\:\\:field");
- let outPutFn = querySelectorFn("#page\\:mainForm\\:j_id_34\\:j_id_37 .form-control-plaintext");
- let submitButtonFn = querySelectorFn("#page\\:mainForm\\:j_id_34\\:localDateTimeButtonStepA");
- let resetButtonFn = querySelectorFn("#page\\:mainForm\\:j_id_2z\\:j_id_2d");
+ const inputFieldFn = querySelectorFn("#page\\:mainForm\\:localDateTimeStepAForm\\:localDateTimeStepA\\:\\:field");
+ const outPutFn = querySelectorFn("#page\\:mainForm\\:localDateTimeStepAForm\\:localDateTimeStepAOutput .form-control-plaintext");
+ const submitButtonFn = querySelectorFn("#page\\:mainForm\\:localDateTimeStepAForm\\:localDateTimeButtonStepA");
+ const resetButtonFn = querySelectorFn("#page\\:mainForm\\:resetButtonFrom\\:resetButton");
const time = "2020-07-07T07:07:07";
const test = new JasmineTestTool(done);
- test.setup(() => outPutFn().textContent !== null,
- null, "click", resetButtonFn);
+ test.setup(() => outPutFn().textContent !== null, null, "click", resetButtonFn);
test.do(() => inputFieldFn().value = time);
test.event("click", submitButtonFn, () => outPutFn().textContent !== "");
test.do(() => expect(outPutFn().textContent === time));
@@ -115,15 +109,14 @@ it("#6 model=java.time.LocalDateTime step=1", function (done) {
});
it("#7 model=java.time.LocalDateTime step=0.001", function (done) {
- let inputFieldFn = querySelectorFn("#page\\:mainForm\\:j_id_39\\:localDateTimeStepB\\:\\:field");
- let outPutFn = querySelectorFn("#page\\:mainForm\\:j_id_39\\:j_id_3c .form-control-plaintext");
- let submitButtonFn = querySelectorFn("#page\\:mainForm\\:j_id_39\\:localDateTimeButtonStepB");
- let resetButtonFn = querySelectorFn("#page\\:mainForm\\:j_id_2z\\:j_id_2d");
+ const inputFieldFn = querySelectorFn("#page\\:mainForm\\:localDateTimeStepBForm\\:localDateTimeStepB\\:\\:field");
+ const outPutFn = querySelectorFn("#page\\:mainForm\\:localDateTimeStepBForm\\:localDateTimeStepBOutput .form-control-plaintext");
+ const submitButtonFn = querySelectorFn("#page\\:mainForm\\:localDateTimeStepBForm\\:localDateTimeButtonStepB");
+ const resetButtonFn = querySelectorFn("#page\\:mainForm\\:resetButtonFrom\\:resetButton");
const time = "2020-07-07T07:07:07.007";
const test = new JasmineTestTool(done);
- test.setup(() => outPutFn().textContent !== null,
- null, "click", resetButtonFn);
+ test.setup(() => outPutFn().textContent !== null, null, "click", resetButtonFn);
test.do(() => inputFieldFn().value = time);
test.event("click", submitButtonFn, () => outPutFn().textContent !== "");
test.do(() => expect(outPutFn().textContent === time));
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1100-date/Date.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1100-date/Date.xhtml
index e0c4a4421a..53443dbe85 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1100-date/Date.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1100-date/Date.xhtml
@@ -22,119 +22,117 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="http://xmlns.jcp.org/jsf/core">
- <tc:form>
- <tc:button label="Reset"></tc:button>
+ <tc:form id="resetButtonFrom">
+ <tc:button id="resetButton" label="Reset"/>
</tc:form>
<tc:segmentLayout large="6seg 6seg" medium="12seg">
-
- <tc:form>
+ <tc:form id="localDateForm">
<tc:box label="#1 model=java.time.LocalDate">
<tc:date id="localDate" label="LocalDate" value="#{dateTestController.localDate}" required="true"/>
- <tc:out label="Output" value="#{dateTestController.localDate}"/>
+ <tc:out id="localDateOutput" label="Output" value="#{dateTestController.localDate}"/>
<tc:button defaultCommand="true" id="localDateButton" label="Submit"/>
</tc:box>
</tc:form>
- <tc:form>
+ <tc:form id="localTimeForm">
<tc:box label="#2 model=java.time.LocalTime">
<tc:date id="localTime" label="LocalTime" value="#{dateTestController.localTime}" required="true"/>
- <tc:out label="Output" value="#{dateTestController.localTime}"/>
+ <tc:out id="localTimeOutput" label="Output" value="#{dateTestController.localTime}"/>
<tc:button defaultCommand="true" id="localTimeButton" label="Submit"/>
</tc:box>
</tc:form>
- <tc:form>
+ <tc:form id="localTimeStepAForm">
<tc:box label="#3 model=java.time.LocalTime step=1">
<tc:date id="localTimeStepA" label="LocalTime" value="#{dateTestController.localTimeStepA}" step="1"
required="true"/>
- <tc:out label="Output" value="#{dateTestController.localTimeStepA}">
+ <tc:out id="localTimeStepAOutput" label="Output" value="#{dateTestController.localTimeStepA}">
<f:convertDateTime pattern="hh:mm:ss" type="localTime"/>
</tc:out>
<tc:button defaultCommand="true" id="localTimeButtonStepA" label="Submit"/>
</tc:box>
</tc:form>
- <tc:form>
+ <tc:form id="localTimeStepBForm">
<tc:box label="#4 model=java.time.LocalTime step=0.001">
<tc:date id="localTimeStepB" label="LocalTime" value="#{dateTestController.localTimeStepB}" step="0.001"
required="true"/>
- <tc:out label="Output" value="#{dateTestController.localTimeStepB}">
+ <tc:out id="localTimeStepBOutput" label="Output" value="#{dateTestController.localTimeStepB}">
<f:convertDateTime pattern="hh:mm:ss.SSS" type="localDateTime"/>
</tc:out>
<tc:button defaultCommand="true" id="localTimeButtonStepB" label="Submit"/>
</tc:box>
</tc:form>
- <tc:form>
+ <tc:form id="localDateTimeForm">
<tc:box label="#5 model=java.time.LocalDateTime">
<tc:date id="localDateTime" label="LocalDateTime" value="#{dateTestController.localDateTime}" required="true"/>
- <tc:out label="Output" value="#{dateTestController.localDateTime}"/>
+ <tc:out id="localDateTimeOutput" label="Output" value="#{dateTestController.localDateTime}"/>
<tc:button defaultCommand="true" id="localDateTimeButton" label="Submit"/>
</tc:box>
</tc:form>
- <tc:form>
+ <tc:form id="localDateTimeStepAForm">
<tc:box label="#6 model=java.time.LocalDateTime step=1">
<tc:date id="localDateTimeStepA" label="LocalDateTime" value="#{dateTestController.localDateTimeStepA}"
required="true" step="1"/>
- <tc:out label="Output" value="#{dateTestController.localDateTimeStepA}">
+ <tc:out id="localDateTimeStepAOutput" label="Output" value="#{dateTestController.localDateTimeStepA}">
<f:convertDateTime pattern="yyyy-MM-dd'T'hh:mm:ss" type="localDateTime"/>
</tc:out>
<tc:button defaultCommand="true" id="localDateTimeButtonStepA" label="Submit"/>
</tc:box>
</tc:form>
- <tc:form>
+ <tc:form id="localDateTimeStepBForm">
<tc:box label="#7 model=java.time.LocalDateTime step=0.001">
<tc:date id="localDateTimeStepB" label="LocalDateTime" value="#{dateTestController.localDateTimeStepB}"
required="true" step="0.001"/>
- <tc:out label="Output" value="#{dateTestController.localDateTimeStepB}">
+ <tc:out id="localDateTimeStepBOutput" label="Output" value="#{dateTestController.localDateTimeStepB}">
<f:convertDateTime pattern="yyyy-MM-dd'T'hh:mm:ss.SSS" type="localDateTime"/>
</tc:out>
<tc:button defaultCommand="true" id="localDateTimeButtonStepB" label="Submit"/>
</tc:box>
</tc:form>
- <tc:form>
+ <tc:form id="monthForm">
<tc:box label="#8 model=java.time.LocalDate type=month">
<p>
<tc:badge markup="warning" value="Attention:"/>
Work in progress.
</p>
<tc:date id="month" label="Month" value="#{dateTestController.month}" type="month" required="true"/>
- <tc:out label="Output" value="#{dateTestController.month}"/>
+ <tc:out id="monthOutput" label="Output" value="#{dateTestController.month}"/>
<tc:button defaultCommand="true" id="monthButton" label="Submit"/>
</tc:box>
</tc:form>
- <tc:form>
+ <tc:form id="weekForm">
<tc:box label="#9 model=java.time.LocalDate type=week">
<p>
<tc:badge markup="warning" value="Attention:"/>
Work in progress.
</p>
<tc:date id="week" label="Week" value="#{dateTestController.week}" type="week" required="true"/>
- <tc:out label="Output" value="#{dateTestController.week}"/>
- <tc:out label="Output" value="#{dateTestController.week}">
+ <tc:out id="weekOutput" label="Output" value="#{dateTestController.week}"/>
+ <tc:out id="weekOutputPattern" label="Output" value="#{dateTestController.week}">
<f:convertDateTime pattern="yyyy-'W'ww" type="localDateTime"/>
</tc:out>
<tc:button defaultCommand="true" id="weekButton" label="Submit"/>
</tc:box>
</tc:form>
- <tc:form>
+ <tc:form id="longForm">
<tc:box label="#10 model=java.lang.Long type=date">
<p>
<tc:badge markup="warning" value="Attention:"/>
Work in progress.
</p>
<tc:date id="long" label="Long" value="#{dateTestController.longValue}" type="date" required="true"/>
- <tc:out label="Output" value="#{dateTestController.longValue}"/>
+ <tc:out id="longOutput" label="Output" value="#{dateTestController.longValue}"/>
<tc:button defaultCommand="true" id="longButton" label="Submit"/>
</tc:box>
</tc:form>
-
</tc:segmentLayout>
</ui:composition>