You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2020/12/08 21:39:02 UTC
[myfaces-tobago] 01/02: replace outdated testFrameQuerySelectorFn
with querySelectorFn
This is an automated email from the ASF dual-hosted git repository.
bommel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 657a29994796462efedab91890b9d4e4adbcb792
Author: Henning Nöth <hn...@apache.org>
AuthorDate: Tue Dec 8 13:00:09 2020 +0100
replace outdated testFrameQuerySelectorFn with querySelectorFn
---
.../20-component/010-input/10-in/In.test.js | 6 +-
.../010-input/20-suggest/Suggest.test.js | 16 ++--
.../20-component/010-input/40-date/Date.test.js | 40 ++++-----
.../010-input/50-input-group/Group.test.js | 26 +++---
.../10-selectBooleanCheckbox/Checkbox.test.js | 46 +++++------
.../15-selectBooleanToggle/Toggle.test.js | 46 +++++------
.../030-select/20-selectOneChoice/Dropdown.test.js | 34 ++++----
.../030-select/40-selectOneListbox/Listbox.test.js | 26 +++---
.../50-selectManyCheckbox/Multi_Checkbox.test.js | 26 +++---
.../70-selectManyShuttle/Shuttle.test.js | 32 ++++----
.../content/20-component/060-popup/Popup.test.js | 76 ++++++++---------
.../content/20-component/070-tab/Tab_Group.test.js | 20 ++---
.../080-sheet/70-tree/Sheet_Tree.test.js | 28 +++----
.../090-tree/00-command/Tree_Command_Types.test.js | 10 +--
.../090-tree/01-select/Tree_Select.test.js | 64 +++++++--------
.../15-suggest-method/Suggest_Method.test.js | 10 +--
.../1020-suggest-quotMark/Suggest_QuotMark.test.js | 8 +-
.../webapp/content/40-test/1040-date/Date.test.js | 10 +--
.../Date_TobagoConverter.test.js | 94 +++++++++++-----------
.../4050-ajax-dropdown/Ajax_Dropdown.test.js | 12 +--
.../40-test/4000-button-link/Button_Link.test.js | 36 ++++-----
.../100-auto-column/Auto-Column.test.js | 6 +-
.../4600-gridLayout/90-style-tag/Style_Tag.test.js | 6 +-
.../100-id-markup/Id_Markup.test.js | 22 ++---
.../4810-labelLayoutTop/LabelLayoutTop.test.js | 6 +-
.../content/40-test/4950-severity/Severity.test.js | 20 ++---
.../20-ajax-execute/Ajax_Execute.test.js | 16 ++--
.../Composite_Components.test.js | 38 ++++-----
.../content/40-test/6000-event/Event.test.js | 34 ++++----
.../content/40-test/6500-behavior/Behavior.test.js | 60 +++++++-------
.../src/main/webapp/script/tobago-test.js | 18 +----
31 files changed, 440 insertions(+), 452 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.test.js
index 8ca212b..eaeacc3 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.test.js
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-import {querySelectorFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn, querySelectorFn} from "/script/tobago-test.js";
import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
it("inputfield with label", function (done) {
- let labelFn = testFrameQuerySelectorFn("#page\\:mainForm\\:iNormal > label");
- let inputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:iNormal\\:\\:field");
+ let labelFn = querySelectorFn("#page\\:mainForm\\:iNormal > label");
+ let inputFieldFn = querySelectorFn("#page\\:mainForm\\:iNormal\\:\\:field");
const test = new JasmineTestTool(done);
test.do(() => expect(labelFn().textContent).toBe("Input"));
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.test.js
index f22cab7..2483139 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.test.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Basics: 'M'", function (assert) {
@@ -47,7 +47,7 @@ QUnit.test("Basics: 'Mars'", function (assert) {
});
function testMarsBasics(assert, inputString, expectedLength) {
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inBasic\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:inBasic\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:inBasic");
let TTT = new TobagoTestTool(assert);
@@ -66,7 +66,7 @@ function testMarsBasics(assert, inputString, expectedLength) {
}
QUnit.test("Basics: Add 'eus' and click first entry.", function (assert) {
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inBasic\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:inBasic\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:inBasic");
let TTT = new TobagoTestTool(assert);
@@ -93,7 +93,7 @@ QUnit.test("Basics: Add 'eus' and click first entry.", function (assert) {
});
QUnit.test("Advanced: 'C'", function (assert) {
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:inAdvanced");
let suggestionDelay = 2000;
@@ -110,7 +110,7 @@ QUnit.test("Advanced: 'C'", function (assert) {
});
QUnit.test("Advanced: 'Ca'", function (assert) {
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:inAdvanced");
let suggestionDelay = 2000;
let startTime = Date.now();
@@ -137,7 +137,7 @@ QUnit.test("Advanced: 'Ca'", function (assert) {
});
QUnit.test("Client side: 'Ju'", function (assert) {
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inClient\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:inClient\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:inClient");
let TTT = new TobagoTestTool(assert);
@@ -158,6 +158,6 @@ function escapeClientId(clientId) {
}
function getSuggestions(id) {
- return testFrameQuerySelectorAllFn(escapeClientId(
- testFrameQuerySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
+ return querySelectorAllFn(escapeClientId(
+ querySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.test.js
index d2afd34..8ecca86 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.test.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
function getToday(dateFieldFn) {
@@ -27,10 +27,10 @@ function getToday(dateFieldFn) {
QUnit.test("date with label", function (assert) {
assert.expect(5);
- let labelFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dNormal > label");
- let dateFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dNormal\\:\\:field");
- let dateButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dNormal button");
- let dayTodayFn = testFrameQuerySelectorFn(".day.today");
+ let labelFn = querySelectorFn("#page\\:mainForm\\:dNormal > label");
+ let dateFieldFn = querySelectorFn("#page\\:mainForm\\:dNormal\\:\\:field");
+ let dateButtonFn = querySelectorFn("#page\\:mainForm\\:dNormal button");
+ let dayTodayFn = querySelectorFn(".day.today");
let today = getToday(dateFieldFn);
assert.equal(labelFn().textContent, "Date");
@@ -51,11 +51,11 @@ QUnit.test("date with label", function (assert) {
});
QUnit.test("date+time pattern", function (assert) {
- let dateButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dateTimePattern .datepickerbutton");
- let datepickerFn = testFrameQuerySelectorFn(".bootstrap-datetimepicker-widget");
- let firstLiFn = testFrameQuerySelectorFn(".bootstrap-datetimepicker-widget .list-unstyled li:first-child");
- let lastLiFn = testFrameQuerySelectorFn(".bootstrap-datetimepicker-widget .list-unstyled li:last-child");
- let togglePickerButtonFn = testFrameQuerySelectorFn(".bootstrap-datetimepicker-widget .picker-switch a");
+ let dateButtonFn = querySelectorFn("#page\\:mainForm\\:dateTimePattern .datepickerbutton");
+ let datepickerFn = querySelectorFn(".bootstrap-datetimepicker-widget");
+ let firstLiFn = querySelectorFn(".bootstrap-datetimepicker-widget .list-unstyled li:first-child");
+ let lastLiFn = querySelectorFn(".bootstrap-datetimepicker-widget .list-unstyled li:last-child");
+ let togglePickerButtonFn = querySelectorFn(".bootstrap-datetimepicker-widget .picker-switch a");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -81,12 +81,12 @@ QUnit.test("date+time pattern", function (assert) {
});
QUnit.test("submit", function (assert) {
- let dateFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:formSubmit\\:input\\:\\:field");
- let dateButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:formSubmit\\:input button");
- let outFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:formSubmit\\:output span");
- let submitButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:formSubmit\\:button");
- let widgetFn = testFrameQuerySelectorAllFn(".bootstrap-datetimepicker-widget");
- let daysFn = testFrameQuerySelectorAllFn(".bootstrap-datetimepicker-widget .day");
+ let dateFieldFn = querySelectorFn("#page\\:mainForm\\:formSubmit\\:input\\:\\:field");
+ let dateButtonFn = querySelectorFn("#page\\:mainForm\\:formSubmit\\:input button");
+ let outFieldFn = querySelectorFn("#page\\:mainForm\\:formSubmit\\:output span");
+ let submitButtonFn = querySelectorFn("#page\\:mainForm\\:formSubmit\\:button");
+ let widgetFn = querySelectorAllFn(".bootstrap-datetimepicker-widget");
+ let daysFn = querySelectorAllFn(".bootstrap-datetimepicker-widget .day");
let day22 = 0;
let TTT = new TobagoTestTool(assert);
@@ -125,10 +125,10 @@ QUnit.test("submit", function (assert) {
});
QUnit.test("ajax", function (assert) {
- let dateFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxinput\\:\\:field");
- let dateButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxinput button");
- let outFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputfield span");
- let widgetFn = testFrameQuerySelectorAllFn(".bootstrap-datetimepicker-widget");
+ let dateFieldFn = querySelectorFn("#page\\:mainForm\\:ajaxinput\\:\\:field");
+ let dateButtonFn = querySelectorFn("#page\\:mainForm\\:ajaxinput button");
+ let outFieldFn = querySelectorFn("#page\\:mainForm\\:outputfield span");
+ let widgetFn = querySelectorAllFn(".bootstrap-datetimepicker-widget");
let today = getToday(dateFieldFn);
let TTT = new TobagoTestTool(assert);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.test.js
index dc68d8c..c64bd4b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.test.js
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("ajax: chat send button", function (assert) {
- let chatlogFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tachatlog\\:\\:field");
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inewmessage\\:\\:field");
- let sendButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sendButton");
+ let chatlogFn = querySelectorFn("#page\\:mainForm\\:tachatlog\\:\\:field");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:inewmessage\\:\\:field");
+ let sendButtonFn = querySelectorFn("#page\\:mainForm\\:sendButton");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -44,11 +44,11 @@ QUnit.test("ajax: chat send button", function (assert) {
});
QUnit.test("ajax: dropdown button", function (assert) {
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:lsendtoc\\:\\:command");
- let buttonLabelFn = testFrameQuerySelectorFn("#page\\:mainForm\\:lsendtoc\\:\\:command span");
- let sendToPeterFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sendToPeter");
- let sendToBobFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sendToBob");
- let sendToAllFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sendToAll");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:lsendtoc\\:\\:command");
+ let buttonLabelFn = querySelectorFn("#page\\:mainForm\\:lsendtoc\\:\\:command span");
+ let sendToPeterFn = querySelectorFn("#page\\:mainForm\\:sendToPeter");
+ let sendToBobFn = querySelectorFn("#page\\:mainForm\\:sendToBob");
+ let sendToAllFn = querySelectorFn("#page\\:mainForm\\:sendToAll");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -79,10 +79,10 @@ QUnit.test("ajax: dropdown button", function (assert) {
});
QUnit.test("ajax: currency change event", function (assert) {
- let currencyInputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:value\\:\\:field");
- let currencyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:currency");
- let currencyOptionFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:currency option");
- let outputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:valueInEuro .tobago-out");
+ let currencyInputFn = querySelectorFn("#page\\:mainForm\\:value\\:\\:field");
+ let currencyFn = querySelectorFn("#page\\:mainForm\\:currency");
+ let currencyOptionFn = querySelectorAllFn("#page\\:mainForm\\:currency option");
+ let outputFieldFn = querySelectorFn("#page\\:mainForm\\:valueInEuro .tobago-out");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.test.js
index 994ce61..b47584e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.test.js
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("submit: select A", function (assert) {
- let selectAFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectA input");
- let selectBFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectB input");
- let selectCFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectC input");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submitOutput span");
+ let selectAFn = querySelectorFn("#page\\:mainForm\\:selectA input");
+ let selectBFn = querySelectorFn("#page\\:mainForm\\:selectB input");
+ let selectCFn = querySelectorFn("#page\\:mainForm\\:selectC input");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:submitOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -40,11 +40,11 @@ QUnit.test("submit: select A", function (assert) {
});
QUnit.test("submit: select B and C", function (assert) {
- let selectAFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectA input");
- let selectBFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectB input");
- let selectCFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectC input");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submitOutput span");
+ let selectAFn = querySelectorFn("#page\\:mainForm\\:selectA input");
+ let selectBFn = querySelectorFn("#page\\:mainForm\\:selectB input");
+ let selectCFn = querySelectorFn("#page\\:mainForm\\:selectC input");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:submitOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -61,8 +61,8 @@ QUnit.test("submit: select B and C", function (assert) {
});
QUnit.test("ajax: select D", function (assert) {
- let selectDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectD input");
- let outputDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputD span");
+ let selectDFn = querySelectorFn("#page\\:mainForm\\:selectD input");
+ let outputDFn = querySelectorFn("#page\\:mainForm\\:outputD span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -77,8 +77,8 @@ QUnit.test("ajax: select D", function (assert) {
});
QUnit.test("ajax: deselect D", function (assert) {
- let selectDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectD input");
- let outputDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputD span");
+ let selectDFn = querySelectorFn("#page\\:mainForm\\:selectD input");
+ let outputDFn = querySelectorFn("#page\\:mainForm\\:outputD span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -93,8 +93,8 @@ QUnit.test("ajax: deselect D", function (assert) {
});
QUnit.test("ajax: select E", function (assert) {
- let selectEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectE input");
- let outputEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputE span");
+ let selectEFn = querySelectorFn("#page\\:mainForm\\:selectE input");
+ let outputEFn = querySelectorFn("#page\\:mainForm\\:outputE span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -109,8 +109,8 @@ QUnit.test("ajax: select E", function (assert) {
});
QUnit.test("ajax: deselect E", function (assert) {
- let selectEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectE input");
- let outputEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputE span");
+ let selectEFn = querySelectorFn("#page\\:mainForm\\:selectE input");
+ let outputEFn = querySelectorFn("#page\\:mainForm\\:outputE span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -125,8 +125,8 @@ QUnit.test("ajax: deselect E", function (assert) {
});
QUnit.test("ajax: select F", function (assert) {
- let selectFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectF input");
- let outputFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputF span");
+ let selectFFn = querySelectorFn("#page\\:mainForm\\:selectF input");
+ let outputFFn = querySelectorFn("#page\\:mainForm\\:outputF span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -141,8 +141,8 @@ QUnit.test("ajax: select F", function (assert) {
});
QUnit.test("ajax: deselect F", function (assert) {
- let selectFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectF input");
- let outputFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputF span");
+ let selectFFn = querySelectorFn("#page\\:mainForm\\:selectF input");
+ let outputFFn = querySelectorFn("#page\\:mainForm\\:outputF span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.test.js
index 994ce61..b47584e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.test.js
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("submit: select A", function (assert) {
- let selectAFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectA input");
- let selectBFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectB input");
- let selectCFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectC input");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submitOutput span");
+ let selectAFn = querySelectorFn("#page\\:mainForm\\:selectA input");
+ let selectBFn = querySelectorFn("#page\\:mainForm\\:selectB input");
+ let selectCFn = querySelectorFn("#page\\:mainForm\\:selectC input");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:submitOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -40,11 +40,11 @@ QUnit.test("submit: select A", function (assert) {
});
QUnit.test("submit: select B and C", function (assert) {
- let selectAFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectA input");
- let selectBFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectB input");
- let selectCFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectC input");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submitOutput span");
+ let selectAFn = querySelectorFn("#page\\:mainForm\\:selectA input");
+ let selectBFn = querySelectorFn("#page\\:mainForm\\:selectB input");
+ let selectCFn = querySelectorFn("#page\\:mainForm\\:selectC input");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:submitOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -61,8 +61,8 @@ QUnit.test("submit: select B and C", function (assert) {
});
QUnit.test("ajax: select D", function (assert) {
- let selectDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectD input");
- let outputDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputD span");
+ let selectDFn = querySelectorFn("#page\\:mainForm\\:selectD input");
+ let outputDFn = querySelectorFn("#page\\:mainForm\\:outputD span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -77,8 +77,8 @@ QUnit.test("ajax: select D", function (assert) {
});
QUnit.test("ajax: deselect D", function (assert) {
- let selectDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectD input");
- let outputDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputD span");
+ let selectDFn = querySelectorFn("#page\\:mainForm\\:selectD input");
+ let outputDFn = querySelectorFn("#page\\:mainForm\\:outputD span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -93,8 +93,8 @@ QUnit.test("ajax: deselect D", function (assert) {
});
QUnit.test("ajax: select E", function (assert) {
- let selectEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectE input");
- let outputEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputE span");
+ let selectEFn = querySelectorFn("#page\\:mainForm\\:selectE input");
+ let outputEFn = querySelectorFn("#page\\:mainForm\\:outputE span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -109,8 +109,8 @@ QUnit.test("ajax: select E", function (assert) {
});
QUnit.test("ajax: deselect E", function (assert) {
- let selectEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectE input");
- let outputEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputE span");
+ let selectEFn = querySelectorFn("#page\\:mainForm\\:selectE input");
+ let outputEFn = querySelectorFn("#page\\:mainForm\\:outputE span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -125,8 +125,8 @@ QUnit.test("ajax: deselect E", function (assert) {
});
QUnit.test("ajax: select F", function (assert) {
- let selectFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectF input");
- let outputFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputF span");
+ let selectFFn = querySelectorFn("#page\\:mainForm\\:selectF input");
+ let outputFFn = querySelectorFn("#page\\:mainForm\\:outputF span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -141,8 +141,8 @@ QUnit.test("ajax: select F", function (assert) {
});
QUnit.test("ajax: deselect F", function (assert) {
- let selectFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectF input");
- let outputFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputF span");
+ let selectFFn = querySelectorFn("#page\\:mainForm\\:selectF input");
+ let outputFFn = querySelectorFn("#page\\:mainForm\\:outputF span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.test.js
index 9297334..d4e4c56 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.test.js
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("submit: Alice", function (assert) {
- let aliceFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Alice']");
- let bobFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Bob']");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputPerson span");
+ let aliceFn = querySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Alice']");
+ let bobFn = querySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Bob']");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:outputPerson span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -38,10 +38,10 @@ QUnit.test("submit: Alice", function (assert) {
});
QUnit.test("submit: Bob", function (assert) {
- let aliceFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Alice']");
- let bobFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Bob']");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputPerson span");
+ let aliceFn = querySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Alice']");
+ let bobFn = querySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Bob']");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:outputPerson span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -57,10 +57,10 @@ QUnit.test("submit: Bob", function (assert) {
});
QUnit.test("ajax: select Mars", function (assert) {
- let planetFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field");
- let marsOptionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='1']");
- let jupiterOptionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='2']");
- let moonsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:moonbox\\:\\:field option");
+ let planetFn = querySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field");
+ let marsOptionFn = querySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='1']");
+ let jupiterOptionFn = querySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='2']");
+ let moonsFn = querySelectorAllFn("#page\\:mainForm\\:moonbox\\:\\:field option");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -77,10 +77,10 @@ QUnit.test("ajax: select Mars", function (assert) {
});
QUnit.test("ajax: select Jupiter", function (assert) {
- let planetFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field");
- let marsOptionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='1']");
- let jupiterOptionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='2']");
- let moonsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:moonbox\\:\\:field option");
+ let planetFn = querySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field");
+ let marsOptionFn = querySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='1']");
+ let jupiterOptionFn = querySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='2']");
+ let moonsFn = querySelectorAllFn("#page\\:mainForm\\:moonbox\\:\\:field option");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.test.js
index 6e72010..6d189b7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.test.js
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("submit: select 'Nile'", function (assert) {
- let riversFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:riverList option");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:riverSubmit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:riverOutput span");
+ let riversFn = querySelectorAllFn("#page\\:mainForm\\:riverList option");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:riverSubmit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:riverOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -40,9 +40,9 @@ QUnit.test("submit: select 'Nile'", function (assert) {
});
QUnit.test("submit: select 'Yangtze'", function (assert) {
- let riversFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:riverList option");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:riverSubmit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:riverOutput span");
+ let riversFn = querySelectorAllFn("#page\\:mainForm\\:riverList option");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:riverSubmit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:riverOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -62,9 +62,9 @@ QUnit.test("submit: select 'Yangtze'", function (assert) {
});
QUnit.test("ajax: select Everest", function (assert) {
- let mountainListFn = testFrameQuerySelectorFn("#page\\:mainForm\\:mountainList\\:\\:field");
- let mountainsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:mountainList option");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectedMountain span");
+ let mountainListFn = querySelectorFn("#page\\:mainForm\\:mountainList\\:\\:field");
+ let mountainsFn = querySelectorAllFn("#page\\:mainForm\\:mountainList option");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:selectedMountain span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -83,9 +83,9 @@ QUnit.test("ajax: select Everest", function (assert) {
});
QUnit.test("ajax: select Makalu", function (assert) {
- let mountainListFn = testFrameQuerySelectorFn("#page\\:mainForm\\:mountainList\\:\\:field");
- let mountainsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:mountainList option");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectedMountain span");
+ let mountainListFn = querySelectorFn("#page\\:mainForm\\:mountainList\\:\\:field");
+ let mountainsFn = querySelectorAllFn("#page\\:mainForm\\:mountainList option");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:selectedMountain span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js
index 19a864f..1da03d0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("submit: select cat", function (assert) {
- let animalsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:animals input");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:animalsOutput span");
+ let animalsFn = querySelectorAllFn("#page\\:mainForm\\:animals input");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:animalsOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -39,9 +39,9 @@ QUnit.test("submit: select cat", function (assert) {
});
QUnit.test("submit: select fox and rabbit", function (assert) {
- let animalsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:animals input");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:animalsOutput span");
+ let animalsFn = querySelectorAllFn("#page\\:mainForm\\:animals input");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:animalsOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -59,8 +59,8 @@ QUnit.test("submit: select fox and rabbit", function (assert) {
});
QUnit.test("ajax: click 'Two'", function (assert) {
- let number2Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:numbers\\:\\:1");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:resultOutput span");
+ let number2Fn = querySelectorFn("#page\\:mainForm\\:numbers\\:\\:1");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:resultOutput span");
let newOutputValue;
let TTT = new TobagoTestTool(assert);
@@ -83,8 +83,8 @@ QUnit.test("ajax: click 'Two'", function (assert) {
});
QUnit.test("ajax: click 'Three'", function (assert) {
- let number3Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:numbers\\:\\:2");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:resultOutput span");
+ let number3Fn = querySelectorFn("#page\\:mainForm\\:numbers\\:\\:2");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:resultOutput span");
let newOutputValue;
let TTT = new TobagoTestTool(assert);
@@ -107,8 +107,8 @@ QUnit.test("ajax: click 'Three'", function (assert) {
});
QUnit.test("ajax: click 'Two'", function (assert) {
- let number2Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:numbers\\:\\:1");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:resultOutput span");
+ let number2Fn = querySelectorFn("#page\\:mainForm\\:numbers\\:\\:1");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:resultOutput span");
let newOutputValue;
let TTT = new TobagoTestTool(assert);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.test.js
index 1593716..727c6ba 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.test.js
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("submit: addAll, removeAll, addItem0to4, removeItem2to3", function (assert) {
- let unselectedOptions = testFrameQuerySelectorAllFn("#page\\:mainForm\\:submitExample\\:\\:unselected option");
- let selectedOptions = testFrameQuerySelectorAllFn("#page\\:mainForm\\:submitExample\\:\\:selected option");
- let addAllButton = testFrameQuerySelectorFn("#page\\:mainForm\\:submitExample\\:\\:addAll");
- let addButton = testFrameQuerySelectorFn("#page\\:mainForm\\:submitExample\\:\\:add");
- let removeButton = testFrameQuerySelectorFn("#page\\:mainForm\\:submitExample\\:\\:remove");
- let removeAllButton = testFrameQuerySelectorFn("#page\\:mainForm\\:submitExample\\:\\:removeAll");
- let submitButton = testFrameQuerySelectorFn("#page\\:mainForm\\:submitButton");
- let output = testFrameQuerySelectorFn("#page\\:mainForm\\:submitExampleOutput span");
+ let unselectedOptions = querySelectorAllFn("#page\\:mainForm\\:submitExample\\:\\:unselected option");
+ let selectedOptions = querySelectorAllFn("#page\\:mainForm\\:submitExample\\:\\:selected option");
+ let addAllButton = querySelectorFn("#page\\:mainForm\\:submitExample\\:\\:addAll");
+ let addButton = querySelectorFn("#page\\:mainForm\\:submitExample\\:\\:add");
+ let removeButton = querySelectorFn("#page\\:mainForm\\:submitExample\\:\\:remove");
+ let removeAllButton = querySelectorFn("#page\\:mainForm\\:submitExample\\:\\:removeAll");
+ let submitButton = querySelectorFn("#page\\:mainForm\\:submitButton");
+ let output = querySelectorFn("#page\\:mainForm\\:submitExampleOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -80,13 +80,13 @@ QUnit.test("submit: addAll, removeAll, addItem0to4, removeItem2to3", function (a
});
QUnit.test("ajax: addAll, removeAll, addItem1to2, removeItem0", function (assert) {
- let unselectedOptions = testFrameQuerySelectorAllFn("#page\\:mainForm\\:ajaxExample\\:\\:unselected option");
- let selectedOptions = testFrameQuerySelectorAllFn("#page\\:mainForm\\:ajaxExample\\:\\:selected option");
- let addAllButton = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:addAll");
- let addButton = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:add");
- let removeButton = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:remove");
- let removeAllButton = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:removeAll");
- let output = testFrameQuerySelectorFn("#page\\:mainForm\\:outputStars span");
+ let unselectedOptions = querySelectorAllFn("#page\\:mainForm\\:ajaxExample\\:\\:unselected option");
+ let selectedOptions = querySelectorAllFn("#page\\:mainForm\\:ajaxExample\\:\\:selected option");
+ let addAllButton = querySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:addAll");
+ let addButton = querySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:add");
+ let removeButton = querySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:remove");
+ let removeAllButton = querySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:removeAll");
+ let output = querySelectorFn("#page\\:mainForm\\:outputStars span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.test.js
index fbbea0e..e2e8fc1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.test.js
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Open 'Client Popup' and press 'Cancel'.", function (assert) {
assert.expect(3);
- let popupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
- let openButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:open");
- let cancelButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
+ let popupFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
+ let openButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:open");
+ let cancelButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
assert.equal(popupFn().getAttribute("value"), "true");
openButtonFn().dispatchEvent(new Event("click", {bubbles: true}));
@@ -33,13 +33,13 @@ QUnit.test("Open 'Client Popup' and press 'Cancel'.", function (assert) {
});
QUnit.test("Open 'Client Popup', press 'Submit' while field is empty. Press 'Cancel'.", function (assert) {
- let popupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
- let openButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:open");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:out span");
- let messagesFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
- let inputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
- let submitButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
- let cancelButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
+ let popupFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
+ let openButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:open");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:form2\\:out span");
+ let messagesFn = querySelectorAllFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
+ let inputFieldFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+ let submitButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
+ let cancelButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
let outputValue = outputFn().textContent;
let TTT = new TobagoTestTool(assert);
@@ -71,13 +71,13 @@ QUnit.test("Open 'Client Popup', press 'Submit' while field is empty. Press 'Can
});
QUnit.test("Open 'Client Popup', press 'Submit' while field has content. Press 'Cancel'.", function (assert) {
- let popupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
- let openButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:open");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:out span");
- let messagesFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
- let inputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
- let submitButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
- let cancelButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
+ let popupFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
+ let openButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:open");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:form2\\:out span");
+ let messagesFn = querySelectorAllFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
+ let inputFieldFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+ let submitButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
+ let cancelButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
let TTT = new TobagoTestTool(assert);
TTT.asserts(1, function () {
@@ -108,11 +108,11 @@ QUnit.test("Open 'Client Popup', press 'Submit' while field has content. Press '
});
QUnit.test("Open 'Client Popup', press 'Submit & Close' while field is empty.", function (assert) {
- let popupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
- let openButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:open");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:out span");
- let inputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
- let submitCloseButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
+ let popupFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
+ let openButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:open");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:form2\\:out span");
+ let inputFieldFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+ let submitCloseButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
let outputValue = outputFn().textContent;
let TTT = new TobagoTestTool(assert);
@@ -138,11 +138,11 @@ QUnit.test("Open 'Client Popup', press 'Submit & Close' while field is empty.",
});
QUnit.test("Open 'Client Popup', press 'Submit & Close' while field has content.", function (assert) {
- let popupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
- let openButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:open");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:out span");
- let inputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
- let submitCloseButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
+ let popupFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
+ let openButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:open");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:form2\\:out span");
+ let inputFieldFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+ let submitCloseButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
let TTT = new TobagoTestTool(assert);
TTT.asserts(1, function () {
@@ -167,11 +167,11 @@ QUnit.test("Open 'Client Popup', press 'Submit & Close' while field has content.
});
QUnit.test("Open 'Large Popup'.", function (assert) {
- let dropdownContainerFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownButton");
- let dropdownButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
- let openButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:largePopupLink");
- let popupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:largePopup");
- let closeButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:largePopup\\:closeLargePopup");
+ let dropdownContainerFn = querySelectorFn("#page\\:mainForm\\:dropdownButton");
+ let dropdownButtonFn = querySelectorFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
+ let openButtonFn = querySelectorFn("#page\\:mainForm\\:largePopupLink");
+ let popupFn = querySelectorFn("#page\\:mainForm\\:largePopup");
+ let closeButtonFn = querySelectorFn("#page\\:mainForm\\:largePopup\\:closeLargePopup");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -213,11 +213,11 @@ QUnit.test("Open 'Large Popup'.", function (assert) {
});
QUnit.test("Open 'Small Popup'.", function (assert) {
- let dropdownContainerFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownButton");
- let dropdownButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
- let openButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:smallPopupLink");
- let popupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:smallPopup");
- let closeButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:smallPopup\\:closeSmallPopup");
+ let dropdownContainerFn = querySelectorFn("#page\\:mainForm\\:dropdownButton");
+ let dropdownButtonFn = querySelectorFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
+ let openButtonFn = querySelectorFn("#page\\:mainForm\\:smallPopupLink");
+ let popupFn = querySelectorFn("#page\\:mainForm\\:smallPopup");
+ let closeButtonFn = querySelectorFn("#page\\:mainForm\\:smallPopup\\:closeSmallPopup");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.test.js
index d9bf8af..12fcc53 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.test.js
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Client: Select Tab 3", function (assert) {
- let tabGroupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabGroupClient");
- let tab1Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tab1Client");
- let tab3Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tab3Client");
+ let tabGroupFn = querySelectorFn("#page\\:mainForm\\:tabGroupClient");
+ let tab1Fn = querySelectorFn("#page\\:mainForm\\:tab1Client");
+ let tab3Fn = querySelectorFn("#page\\:mainForm\\:tab3Client");
let TTT = new TobagoTestTool(assert);
TTT.asserts(5, function () {
@@ -45,9 +45,9 @@ QUnit.test("Client: Select Tab 3", function (assert) {
});
QUnit.test("Ajax: Select Tab 3", function (assert) {
- let tabGroupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabGroupAjax");
- let tab1Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tab1Ajax");
- let tab3Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tab3Ajax");
+ let tabGroupFn = querySelectorFn("#page\\:mainForm\\:tabGroupAjax");
+ let tab1Fn = querySelectorFn("#page\\:mainForm\\:tab1Ajax");
+ let tab3Fn = querySelectorFn("#page\\:mainForm\\:tab3Ajax");
let TTT = new TobagoTestTool(assert);
TTT.asserts(5, function () {
@@ -72,9 +72,9 @@ QUnit.test("Ajax: Select Tab 3", function (assert) {
});
QUnit.test("FullReload: Select Tab 3", function (assert) {
- let tabGroupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabGroupFullReload");
- let tab1Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tab1FullReload");
- let tab3Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tab3FullReload");
+ let tabGroupFn = querySelectorFn("#page\\:mainForm\\:tabGroupFullReload");
+ let tab1Fn = querySelectorFn("#page\\:mainForm\\:tab1FullReload");
+ let tab3Fn = querySelectorFn("#page\\:mainForm\\:tab3FullReload");
let TTT = new TobagoTestTool(assert);
TTT.asserts(5, function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.test.js
index 814506f..def1b1c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.test.js
@@ -15,23 +15,23 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
it("Collapse tree", function (done) {
- let row0nameFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:nameOut");
- let row0centralBodyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:centralBodyOut");
- let row0distanceFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:distanceOut");
- let row0periodFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:periodOut");
- let row0discovererFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:discovererOut");
- let row0yearFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:yearOut");
- let row1nameFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:1\\:nameOut");
- let row1centralBodyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:1\\:centralBodyOut");
- let row1distanceFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:1\\:distanceOut");
- let row1periodFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:1\\:periodOut");
- let row1discovererFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:1\\:discovererOut");
- let row1yearFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:1\\:yearOut");
- let rootTreeButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:nameCol .tobago-treeNode-toggle");
+ let row0nameFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:nameOut");
+ let row0centralBodyFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:centralBodyOut");
+ let row0distanceFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:distanceOut");
+ let row0periodFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:periodOut");
+ let row0discovererFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:discovererOut");
+ let row0yearFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:yearOut");
+ let row1nameFn = querySelectorFn("#page\\:mainForm\\:sheet\\:1\\:nameOut");
+ let row1centralBodyFn = querySelectorFn("#page\\:mainForm\\:sheet\\:1\\:centralBodyOut");
+ let row1distanceFn = querySelectorFn("#page\\:mainForm\\:sheet\\:1\\:distanceOut");
+ let row1periodFn = querySelectorFn("#page\\:mainForm\\:sheet\\:1\\:periodOut");
+ let row1discovererFn = querySelectorFn("#page\\:mainForm\\:sheet\\:1\\:discovererOut");
+ let row1yearFn = querySelectorFn("#page\\:mainForm\\:sheet\\:1\\:yearOut");
+ let rootTreeButtonFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:nameCol .tobago-treeNode-toggle");
let test = new JasmineTestTool(done);
test.do(() => expect(row0nameFn().textContent).toBe("Sun"));
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.test.js
index de1a714..170ce03 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.test.js
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("execute both 'Action 1' and 'Action 2' two times", function (assert) {
- let action1Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tree\\:2\\:actionCommand");
- let action2Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tree\\:3\\:actionCommand");
- let actionCount1Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:actionCount1 .tobago-out");
- let actionCount2Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:actionCount2 .tobago-out");
+ let action1Fn = querySelectorFn("#page\\:mainForm\\:tree\\:2\\:actionCommand");
+ let action2Fn = querySelectorFn("#page\\:mainForm\\:tree\\:3\\:actionCommand");
+ let actionCount1Fn = querySelectorFn("#page\\:mainForm\\:actionCount1 .tobago-out");
+ let actionCount2Fn = querySelectorFn("#page\\:mainForm\\:actionCount2 .tobago-out");
const counterBeforeTestResult1 = Number(actionCount1Fn().textContent);
const counterBeforeTestResult2 = Number(actionCount2Fn().textContent);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.test.js
index 0c67389..b0bd21f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.test.js
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("single: select Music, select Mathematics", function (assert) {
- let musicFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
- let mathematicsFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
- let selectableNoneFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
- let selectableSingleFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:1");
- let inputFn = testFrameQuerySelectorFn("tobago-tree-select input");
+ let musicFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
+ let mathematicsFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
+ let selectableNoneFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
+ let selectableSingleFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:1");
+ let inputFn = querySelectorFn("tobago-tree-select input");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -63,12 +63,12 @@ QUnit.test("single: select Music, select Mathematics", function (assert) {
});
QUnit.test("singleLeafOnly: select Classic, select Geography", function (assert) {
- let classicFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
- let geographyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:10\\:select");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
- let selectableNoneFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
- let selectableSingleLeafOnlyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:2");
- let inputFn = testFrameQuerySelectorFn("tobago-tree-select input");
+ let classicFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
+ let geographyFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:10\\:select");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
+ let selectableNoneFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
+ let selectableSingleLeafOnlyFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:2");
+ let inputFn = querySelectorFn("tobago-tree-select input");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -107,12 +107,12 @@ QUnit.test("singleLeafOnly: select Classic, select Geography", function (assert)
});
QUnit.test("multi: select Music, select Geography, deselect Music", function (assert) {
- let musicFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
- let geographyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:10\\:select");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
- let selectableNoneFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
- let selectableMultiFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:3");
- let inputFn = testFrameQuerySelectorFn("tobago-tree-select input");
+ let musicFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
+ let geographyFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:10\\:select");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
+ let selectableNoneFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
+ let selectableMultiFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:3");
+ let inputFn = querySelectorFn("tobago-tree-select input");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -159,12 +159,12 @@ QUnit.test("multi: select Music, select Geography, deselect Music", function (as
});
QUnit.test("multiLeafOnly: select Classic, select Geography, deselect Classic", function (assert) {
- let classicFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
- let geographyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
- let selectableNoneFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
- let selectableMultiLeafOnlyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:4");
- let inputFn = testFrameQuerySelectorFn("tobago-tree-select input");
+ let classicFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
+ let geographyFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
+ let selectableNoneFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
+ let selectableMultiLeafOnlyFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:4");
+ let inputFn = querySelectorFn("tobago-tree-select input");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -211,13 +211,13 @@ QUnit.test("multiLeafOnly: select Classic, select Geography, deselect Classic",
});
QUnit.test("multiCascade: select Music, select Mathematics, deselect Classic", function (assert) {
- let musicFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
- let classicFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
- let mathematicsFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
- let selectableNoneFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
- let selectableMultiCascadeFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:5");
- let inputFn = testFrameQuerySelectorFn("tobago-tree-select input");
+ let musicFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
+ let classicFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
+ let mathematicsFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
+ let selectableNoneFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
+ let selectableMultiCascadeFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:5");
+ let inputFn = querySelectorFn("tobago-tree-select input");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.test.js
index c3d87da..435920b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.test.js
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Deprecated: 'Ma'", function (assert) {
let inputString = "Ma";
let expectedLength = 4;
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:deprecated\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:deprecated\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:deprecated");
let TTT = new TobagoTestTool(assert);
@@ -44,7 +44,7 @@ QUnit.test("Replacement: 'Ma'", function (assert) {
let inputString = "Ma";
let expectedLength = 4;
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:replacement\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:replacement\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:replacement");
let TTT = new TobagoTestTool(assert);
@@ -67,6 +67,6 @@ function escapeClientId(clientId) {
}
function getSuggestions(id) {
- return testFrameQuerySelectorAllFn(escapeClientId(
- testFrameQuerySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
+ return querySelectorAllFn(escapeClientId(
+ querySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.test.js
index 2cfeae4..461e21c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.test.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Basics: 'M'", function (assert) {
@@ -47,7 +47,7 @@ QUnit.test("Basics: 'Mars'", function (assert) {
});
function testMarsBasics(assert, inputString, expectedLength) {
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:input\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:input\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:input");
let TTT = new TobagoTestTool(assert);
@@ -70,6 +70,6 @@ function escapeClientId(clientId) {
}
function getSuggestions(id) {
- return testFrameQuerySelectorAllFn(escapeClientId(
- testFrameQuerySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
+ return querySelectorAllFn(escapeClientId(
+ querySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.test.js
index dd0f42a..3afe132 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.test.js
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
QUnit.test("inputfield with label", function (assert) {
- let dateFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dateNoPattern\\:\\:field");
- let dateButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dateNoPattern button");
+ let dateFieldFn = querySelectorFn("#page\\:mainForm\\:dateNoPattern\\:\\:field");
+ let dateButtonFn = querySelectorFn("#page\\:mainForm\\:dateNoPattern button");
assert.equal(dateFieldFn().value, "");
- let datepickerFn = testFrameQuerySelectorAllFn(".bootstrap-datetimepicker-widget");
+ let datepickerFn = querySelectorAllFn(".bootstrap-datetimepicker-widget");
assert.notOk(datepickerFn().item(0));
dateButtonFn().dispatchEvent(new Event("click", {bubbles: true}));
- datepickerFn = testFrameQuerySelectorAllFn(".bootstrap-datetimepicker-widget");
+ datepickerFn = querySelectorAllFn(".bootstrap-datetimepicker-widget");
assert.ok(datepickerFn().item(0));
assert.notEqual(dateFieldFn().value, "");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.test.js
index d3907d8..7eb8b88 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.test.js
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Date - f:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesDateInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesDateInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesDateOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:myfacesDateInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:myfacesDateInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:myfacesDateOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -30,9 +30,9 @@ QUnit.test("Date - f:convertDateTime", function (assert) {
});
QUnit.test("Date - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoDateInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoDateInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoDateOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoDateInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoDateInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoDateOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -41,9 +41,9 @@ QUnit.test("Date - tc:convertDateTime", function (assert) {
});
QUnit.test("Calendar - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoDateInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoDateInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoDateOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoDateInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoDateInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoDateOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -52,9 +52,9 @@ QUnit.test("Calendar - tc:convertDateTime", function (assert) {
});
QUnit.test("LocalDate - f:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalDateInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalDateInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalDateOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalDateInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalDateInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalDateOutput .tobago-out");
if (inputFn() !== null) {
testConvertDateTime(assert,
@@ -67,9 +67,9 @@ QUnit.test("LocalDate - f:convertDateTime", function (assert) {
});
QUnit.test("LocalDate - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalDateInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalDateInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalDateOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalDateInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalDateInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalDateOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -78,9 +78,9 @@ QUnit.test("LocalDate - tc:convertDateTime", function (assert) {
});
QUnit.test("LocalTime - f:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalTimeOutput .tobago-out");
if (inputFn() !== null) {
testConvertDateTime(assert,
@@ -93,9 +93,9 @@ QUnit.test("LocalTime - f:convertDateTime", function (assert) {
});
QUnit.test("LocalTime - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalTimeOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -104,9 +104,9 @@ QUnit.test("LocalTime - tc:convertDateTime", function (assert) {
});
QUnit.test("LocalDateTime - f:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalDateTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalDateTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalDateTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalDateTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalDateTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalDateTimeOutput .tobago-out");
if (inputFn() !== null) {
testConvertDateTime(assert,
@@ -119,9 +119,9 @@ QUnit.test("LocalDateTime - f:convertDateTime", function (assert) {
});
QUnit.test("LocalDateTime - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalDateTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalDateTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalDateTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalDateTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalDateTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalDateTimeOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -130,9 +130,9 @@ QUnit.test("LocalDateTime - tc:convertDateTime", function (assert) {
});
QUnit.test("OffsetTime - f:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesOffsetTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesOffsetTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesOffsetTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:myfacesOffsetTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:myfacesOffsetTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:myfacesOffsetTimeOutput .tobago-out");
if (inputFn() !== null) {
testConvertDateTime(assert,
@@ -145,9 +145,9 @@ QUnit.test("OffsetTime - f:convertDateTime", function (assert) {
});
QUnit.test("OffsetTime - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoOffsetTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoOffsetTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoOffsetTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoOffsetTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoOffsetTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoOffsetTimeOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -156,9 +156,9 @@ QUnit.test("OffsetTime - tc:convertDateTime", function (assert) {
});
QUnit.test("OffsetDateTime - f:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesOffsetDateTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesOffsetDateTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesOffsetDateTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:myfacesOffsetDateTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:myfacesOffsetDateTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:myfacesOffsetDateTimeOutput .tobago-out");
if (inputFn() !== null) {
testConvertDateTime(assert,
@@ -171,9 +171,9 @@ QUnit.test("OffsetDateTime - f:convertDateTime", function (assert) {
});
QUnit.test("OffsetDateTime - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoOffsetDateTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoOffsetDateTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoOffsetDateTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoOffsetDateTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoOffsetDateTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoOffsetDateTimeOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -182,9 +182,9 @@ QUnit.test("OffsetDateTime - tc:convertDateTime", function (assert) {
});
QUnit.test("ZonedDateTime - f:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesZonedDateTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesZonedDateTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesZonedDateTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:myfacesZonedDateTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:myfacesZonedDateTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:myfacesZonedDateTimeOutput .tobago-out");
if (inputFn() !== null) {
testConvertDateTime(assert,
@@ -197,9 +197,9 @@ QUnit.test("ZonedDateTime - f:convertDateTime", function (assert) {
});
QUnit.test("ZonedDateTime - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoZonedDateTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoZonedDateTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoZonedDateTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoZonedDateTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoZonedDateTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoZonedDateTimeOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -210,7 +210,7 @@ QUnit.test("ZonedDateTime - tc:convertDateTime", function (assert) {
function testConvertDateTime(assert, inputFn, datepickerButtonFn, outputFn,
expectPattern, expectCalendarIcon, expectClockIcon,
inputValue, expectOutputValue) {
- let submitButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submitButton");
+ let submitButtonFn = querySelectorFn("#page\\:mainForm\\:submitButton");
let TTT = new TobagoTestTool(assert);
TTT.asserts(3, function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.test.js
index bf4502f..b70198c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.test.js
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Execute 'AJAX' entry in dropdown menu", function (assert) {
- let dropdownMenuButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownMenuButton\\:\\:command");
+ let dropdownMenuButtonFn = querySelectorFn("#page\\:mainForm\\:dropdownMenuButton\\:\\:command");
const ajaxEntryId = "#page\\:mainForm\\:ajaxEntry";
- let ajaxEntryFn = testFrameQuerySelectorFn(ajaxEntryId);
- let tobagoPageMenuStoreFn = testFrameQuerySelectorFn(".tobago-page-menuStore");
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inputAjax\\:\\:field");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputAjax .tobago-out");
+ let ajaxEntryFn = querySelectorFn(ajaxEntryId);
+ let tobagoPageMenuStoreFn = querySelectorFn(".tobago-page-menuStore");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:inputAjax\\:\\:field");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:outputAjax .tobago-out");
let TTT = new TobagoTestTool(assert);
TTT.asserts(1, function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.test.js
index 356946d..a86817b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.test.js
@@ -15,35 +15,35 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Standard Action Button", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:standardButtonAction");
- let destinationSectionFn = testFrameQuerySelectorFn("#page\\:actionSection");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:standardButtonAction");
+ let destinationSectionFn = querySelectorFn("#page\\:actionSection");
testStandardCommands(commandFn, destinationSectionFn, assert);
});
QUnit.test("Standard Link Button", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:standardButtonLink");
- let destinationSectionFn = testFrameQuerySelectorFn("#page\\:linkSection");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:standardButtonLink");
+ let destinationSectionFn = querySelectorFn("#page\\:linkSection");
testStandardCommands(commandFn, destinationSectionFn, assert);
});
QUnit.test("Standard Action Link", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:standardLinkAction");
- let destinationSectionFn = testFrameQuerySelectorFn("#page\\:actionSection");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:standardLinkAction");
+ let destinationSectionFn = querySelectorFn("#page\\:actionSection");
testStandardCommands(commandFn, destinationSectionFn, assert);
});
QUnit.test("Standard Link Link", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:standardLinkLink");
- let destinationSectionFn = testFrameQuerySelectorFn("#page\\:linkSection");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:standardLinkLink");
+ let destinationSectionFn = querySelectorFn("#page\\:linkSection");
testStandardCommands(commandFn, destinationSectionFn, assert);
});
function testStandardCommands(commandFn, destinationSectionFn, assert) {
- let backFn = testFrameQuerySelectorFn("#page\\:back");
+ let backFn = querySelectorFn("#page\\:back");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -64,31 +64,31 @@ function testStandardCommands(commandFn, destinationSectionFn, assert) {
}
QUnit.test("Target Action Button", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:targetButtonAction");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:targetButtonAction");
testTargetCommands(commandFn, "accessed by action", assert);
});
QUnit.test("Target Link Button", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:targetButtonLink");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:targetButtonLink");
testTargetCommands(commandFn, "accessed by link", assert);
});
QUnit.test("Target Action Link", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:targetLinkAction");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:targetLinkAction");
testTargetCommands(commandFn, "accessed by action", assert);
});
QUnit.test("Target Link Link", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:targetLinkLink");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:targetLinkLink");
testTargetCommands(commandFn, "accessed by link", assert);
});
QUnit.test("Style must not be a dropdown item", function (assert) {
assert.expect(3);
- let dropdownMenuFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu");
- let styleAsItemFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu .dropdown-item > style");
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownWithStyle > .tobago-button");
+ let dropdownMenuFn = querySelectorFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu");
+ let styleAsItemFn = querySelectorFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu .dropdown-item > style");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:dropdownWithStyle > .tobago-button");
assert.ok(dropdownMenuFn() !== null);
assert.equal(styleAsItemFn(), null);
@@ -108,6 +108,6 @@ function testTargetCommands(commandFn, expectedText, assert) {
}
function getTargetFrameTestInputValue() {
- return testFrameQuerySelectorFn("#page\\:mainForm\\:targetFrame")().contentWindow
+ return querySelectorFn("#page\\:mainForm\\:targetFrame")().contentWindow
.document.querySelector("#textInput").value;
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.test.js
index ef5f04f..143877e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.test.js
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
QUnit.test("test width of grid layout and 'auto' button", function (assert) {
assert.expect(2);
- let gridLayoutFn = testFrameQuerySelectorFn("#page\\:mainForm\\:grid");
- let buttonAutoFn = testFrameQuerySelectorFn("#page\\:mainForm\\:buttonAuto");
+ let gridLayoutFn = querySelectorFn("#page\\:mainForm\\:grid");
+ let buttonAutoFn = querySelectorFn("#page\\:mainForm\\:buttonAuto");
assert.equal(gridLayoutFn().offsetWidth, 358);
assert.equal(buttonAutoFn().offsetWidth, 58);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.test.js
index 1dbdd57..b4336d3 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.test.js
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Style tag inside grid layout", function (assert) {
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:output .tobago-out");
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submitButton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:output .tobago-out");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:submitButton");
let TTT = new TobagoTestTool(assert);
TTT.asserts(1, function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.test.js
index d317001..e37c8fb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.test.js
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
QUnit.test("No label set", function (assert) {
assert.expect(5);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionNoLabel");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionNoLabel");
let rootDiv = sectionFn().querySelector(".tobago-section-content > tobago-in");
let label = rootDiv.querySelector("label");
let input = rootDiv.querySelector("input");
@@ -35,7 +35,7 @@ QUnit.test("No label set", function (assert) {
QUnit.test("labelLayout=none", function (assert) {
assert.expect(5);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionNone");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionNone");
let rootDiv = sectionFn().querySelector(".tobago-section-content > tobago-in");
let label = rootDiv.querySelector("label");
let input = rootDiv.querySelector("input");
@@ -50,7 +50,7 @@ QUnit.test("labelLayout=none", function (assert) {
QUnit.test("labelLayout=skip", function (assert) {
assert.expect(3);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionSkip");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionSkip");
let rootInput = sectionFn().querySelector(".tobago-section-content > input");
let label = sectionFn().querySelector("label");
@@ -62,7 +62,7 @@ QUnit.test("labelLayout=skip", function (assert) {
QUnit.test("labelLayout=top", function (assert) {
assert.expect(5);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionTop");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionTop");
let rootDiv = sectionFn().querySelector(".tobago-section-content > tobago-in");
let label = rootDiv.querySelector("label");
let input = rootDiv.querySelector("input");
@@ -77,7 +77,7 @@ QUnit.test("labelLayout=top", function (assert) {
QUnit.test("labelLayout=flowLeft", function (assert) {
assert.expect(5);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionFlowLeft");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionFlowLeft");
let rootDiv = sectionFn().querySelector(".tobago-section-content > tobago-in");
let label = rootDiv.querySelector("label");
let input = rootDiv.querySelector("input");
@@ -92,7 +92,7 @@ QUnit.test("labelLayout=flowLeft", function (assert) {
QUnit.test("labelLayout=flowRight", function (assert) {
assert.expect(5);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionFlowRight");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionFlowRight");
let rootDiv = sectionFn().querySelector(".tobago-section-content > tobago-in");
let label = rootDiv.querySelector("label");
let input = rootDiv.querySelector("input");
@@ -107,7 +107,7 @@ QUnit.test("labelLayout=flowRight", function (assert) {
QUnit.test("labelLayout=flexLeft", function (assert) {
assert.expect(5);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionFlexLeft");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionFlexLeft");
let rootDiv = sectionFn().querySelector(".tobago-section-content > tobago-in");
let label = rootDiv.querySelector("label");
let input = rootDiv.querySelector("input");
@@ -122,7 +122,7 @@ QUnit.test("labelLayout=flexLeft", function (assert) {
QUnit.test("labelLayout=flexRight", function (assert) {
assert.expect(5);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionFlexRight");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionFlexRight");
let rootDiv = sectionFn().querySelector(".tobago-section-content > tobago-in");
let label = rootDiv.querySelector("label");
let input = rootDiv.querySelector("input");
@@ -137,7 +137,7 @@ QUnit.test("labelLayout=flexRight", function (assert) {
QUnit.test("labelLayout=segmentLeft", function (assert) {
assert.expect(6);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionSegmentLeft");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionSegmentLeft");
let segmentLayout = sectionFn().querySelector(".tobago-section-content > div");
let labelSegment = segmentLayout.querySelector(".col-3 > tobago-in");
let inputSegment = segmentLayout.querySelector(".col-9 > tobago-in");
@@ -155,7 +155,7 @@ QUnit.test("labelLayout=segmentLeft", function (assert) {
QUnit.test("labelLayout=segmentRight", function (assert) {
assert.expect(6);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionSegmentRight");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionSegmentRight");
let segmentLayout = sectionFn().querySelector(".tobago-section-content > div");
let labelSegment = segmentLayout.querySelector(".col-3 > tobago-in");
let inputSegment = segmentLayout.querySelector(".col-9 > tobago-in");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.test.js
index 68e0e65..17c8abb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.test.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
QUnit.test("Check width for tc:date", function (assert) {
assert.expect(2);
@@ -83,8 +83,8 @@ QUnit.test("Check width for tc:textarea", function (assert) {
});
function testWidth(assert, idPart) {
- let compLabelFn = testFrameQuerySelectorFn("#page\\:mainForm\\:" + idPart + " label");
- let compTopFn = testFrameQuerySelectorFn("#page\\:mainForm\\:" + idPart + "Top");
+ let compLabelFn = querySelectorFn("#page\\:mainForm\\:" + idPart + " label");
+ let compTopFn = querySelectorFn("#page\\:mainForm\\:" + idPart + "Top");
assert.equal(getComputedStyle(compLabelFn()).width, "155px");
assert.equal(getComputedStyle(compTopFn().querySelector("label")).width, getComputedStyle(compTopFn()).width);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.test.js
index 68443fa..6ca21f7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.test.js
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Check severity CSS classes", function (assert) {
- let submitButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let fatalInputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:fatal\\:\\:field");
- let errorInputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:error\\:\\:field");
- let warnInputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:warn\\:\\:field");
- let infoInputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:info\\:\\:field");
- let fatalButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:fatal .tobago-messages-button");
- let errorButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:error .tobago-messages-button");
- let warnButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:warn .tobago-messages-button");
- let infoButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:info .tobago-messages-button");
+ let submitButtonFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let fatalInputFieldFn = querySelectorFn("#page\\:mainForm\\:fatal\\:\\:field");
+ let errorInputFieldFn = querySelectorFn("#page\\:mainForm\\:error\\:\\:field");
+ let warnInputFieldFn = querySelectorFn("#page\\:mainForm\\:warn\\:\\:field");
+ let infoInputFieldFn = querySelectorFn("#page\\:mainForm\\:info\\:\\:field");
+ let fatalButtonFn = querySelectorFn("#page\\:mainForm\\:fatal .tobago-messages-button");
+ let errorButtonFn = querySelectorFn("#page\\:mainForm\\:error .tobago-messages-button");
+ let warnButtonFn = querySelectorFn("#page\\:mainForm\\:warn .tobago-messages-button");
+ let infoButtonFn = querySelectorFn("#page\\:mainForm\\:info .tobago-messages-button");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.test.js
index c3245fc..391d78f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.test.js
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("ajax excecute", function (assert) {
- let in1Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:in1\\:\\:field");
- let in2Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:in2\\:\\:field");
- let in3Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:in3\\:\\:field");
- let in4Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:in4\\:\\:field");
- let clearButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:clear");
- let submitButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let reloadButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:reload");
+ let in1Fn = querySelectorFn("#page\\:mainForm\\:in1\\:\\:field");
+ let in2Fn = querySelectorFn("#page\\:mainForm\\:in2\\:\\:field");
+ let in3Fn = querySelectorFn("#page\\:mainForm\\:in3\\:\\:field");
+ let in4Fn = querySelectorFn("#page\\:mainForm\\:in4\\:\\:field");
+ let clearButtonFn = querySelectorFn("#page\\:mainForm\\:clear");
+ let submitButtonFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let reloadButtonFn = querySelectorFn("#page\\:mainForm\\:reload");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/Composite_Components.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/Composite_Components.test.js
index 6464aed..03f0006 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/Composite_Components.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/Composite_Components.test.js
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
it("no layout manager", function () {
- const inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:noLayoutIn\\:in\\:\\:field");
- const outFn = testFrameQuerySelectorFn("#page\\:mainForm\\:noLayoutOut\\:out");
- const notRenderedFn = testFrameQuerySelectorFn("#page\\:mainForm\\:noLayoutNotRendered\\:in\\:\\:field");
+ const inFn = querySelectorFn("#page\\:mainForm\\:noLayoutIn\\:in\\:\\:field");
+ const outFn = querySelectorFn("#page\\:mainForm\\:noLayoutOut\\:out");
+ const notRenderedFn = querySelectorFn("#page\\:mainForm\\:noLayoutNotRendered\\:in\\:\\:field");
expect(inFn()).not.toBeNull();
expect(outFn()).not.toBeNull();
@@ -28,9 +28,9 @@ it("no layout manager", function () {
});
it("flowlayout", function () {
- const inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:flowLayoutIn\\:in\\:\\:field");
- const outFn = testFrameQuerySelectorFn("#page\\:mainForm\\:flowLayoutOut\\:out");
- const notRenderedFn = testFrameQuerySelectorFn("#page\\:mainForm\\:flowLayoutNotRendered\\:in\\:\\:field");
+ const inFn = querySelectorFn("#page\\:mainForm\\:flowLayoutIn\\:in\\:\\:field");
+ const outFn = querySelectorFn("#page\\:mainForm\\:flowLayoutOut\\:out");
+ const notRenderedFn = querySelectorFn("#page\\:mainForm\\:flowLayoutNotRendered\\:in\\:\\:field");
expect(inFn()).not.toBeNull();
expect(outFn()).not.toBeNull();
@@ -38,9 +38,9 @@ it("flowlayout", function () {
});
it("flexlayout", function () {
- const inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:flexLayoutIn\\:in\\:\\:field");
- const outFn = testFrameQuerySelectorFn("#page\\:mainForm\\:flexLayoutOut\\:out");
- const notRenderedFn = testFrameQuerySelectorFn("#page\\:mainForm\\:flexLayoutNotRendered\\:in\\:\\:field");
+ const inFn = querySelectorFn("#page\\:mainForm\\:flexLayoutIn\\:in\\:\\:field");
+ const outFn = querySelectorFn("#page\\:mainForm\\:flexLayoutOut\\:out");
+ const notRenderedFn = querySelectorFn("#page\\:mainForm\\:flexLayoutNotRendered\\:in\\:\\:field");
expect(inFn()).not.toBeNull();
expect(outFn()).not.toBeNull();
@@ -48,9 +48,9 @@ it("flexlayout", function () {
});
it("segmentlayout", function () {
- const inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:segLayoutIn\\:in\\:\\:field");
- const outFn = testFrameQuerySelectorFn("#page\\:mainForm\\:segLayoutOut\\:out");
- const notRenderedFn = testFrameQuerySelectorFn("#page\\:mainForm\\:segLayoutNotRendered\\:in\\:\\:field");
+ const inFn = querySelectorFn("#page\\:mainForm\\:segLayoutIn\\:in\\:\\:field");
+ const outFn = querySelectorFn("#page\\:mainForm\\:segLayoutOut\\:out");
+ const notRenderedFn = querySelectorFn("#page\\:mainForm\\:segLayoutNotRendered\\:in\\:\\:field");
expect(inFn()).not.toBeNull();
expect(outFn()).not.toBeNull();
@@ -58,9 +58,9 @@ it("segmentlayout", function () {
});
it("gridlayout", function () {
- const inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:gridLayoutIn\\:in\\:\\:field");
- const outFn = testFrameQuerySelectorFn("#page\\:mainForm\\:gridLayoutOut\\:out");
- const notRenderedFn = testFrameQuerySelectorFn("#page\\:mainForm\\:gridLayoutNotRendered\\:in\\:\\:field");
+ const inFn = querySelectorFn("#page\\:mainForm\\:gridLayoutIn\\:in\\:\\:field");
+ const outFn = querySelectorFn("#page\\:mainForm\\:gridLayoutOut\\:out");
+ const notRenderedFn = querySelectorFn("#page\\:mainForm\\:gridLayoutNotRendered\\:in\\:\\:field");
expect(inFn()).not.toBeNull();
expect(outFn()).not.toBeNull();
@@ -68,9 +68,9 @@ it("gridlayout", function () {
});
it("splitlayout", function () {
- const inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:splitLayoutIn\\:in\\:\\:field");
- const outFn = testFrameQuerySelectorFn("#page\\:mainForm\\:splitLayoutOut\\:out");
- const notRenderedFn = testFrameQuerySelectorFn("#page\\:mainForm\\:splitLayoutNotRendered\\:in\\:\\:field");
+ const inFn = querySelectorFn("#page\\:mainForm\\:splitLayoutIn\\:in\\:\\:field");
+ const outFn = querySelectorFn("#page\\:mainForm\\:splitLayoutOut\\:out");
+ const notRenderedFn = querySelectorFn("#page\\:mainForm\\:splitLayoutNotRendered\\:in\\:\\:field");
expect(inFn()).not.toBeNull();
expect(outFn()).not.toBeNull();
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.test.js
index 66c9eab..87c25bd 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.test.js
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("tc:button", function (assert) {
let eventNames = ["click", "dblclick", "focus", "blur"];
- let eventComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:buttonevent");
- let ajaxComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:buttonajax");
+ let eventComponentFn = querySelectorFn("#page\\:mainForm\\:buttonevent");
+ let ajaxComponentFn = querySelectorFn("#page\\:mainForm\\:buttonajax");
testEvent(assert, "button", eventNames, eventComponentFn, ajaxComponentFn, null);
});
QUnit.test("tc:in", function (assert) {
let eventNames = ["change", "click", "dblclick", "focus", "blur"];
- let eventComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inevent\\:\\:field");
- let ajaxComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inajax\\:\\:field");
+ let eventComponentFn = querySelectorFn("#page\\:mainForm\\:inevent\\:\\:field");
+ let ajaxComponentFn = querySelectorFn("#page\\:mainForm\\:inajax\\:\\:field");
let changeValue = function (componentFn) {
let oldValue = componentFn().value;
let newValue = "hello";
@@ -42,15 +42,15 @@ QUnit.test("tc:in", function (assert) {
QUnit.test("tc:row", function (assert) {
let eventNames = ["click", "dblclick"];
- let eventComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheetevent\\:0\\:selectPlanet");
- let ajaxComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheetajax\\:0\\:selectPlanet");
+ let eventComponentFn = querySelectorFn("#page\\:mainForm\\:sheetevent\\:0\\:selectPlanet");
+ let ajaxComponentFn = querySelectorFn("#page\\:mainForm\\:sheetajax\\:0\\:selectPlanet");
testEvent(assert, "row", eventNames, eventComponentFn, ajaxComponentFn, null);
});
QUnit.test("tc:selectBooleanCheckbox", function (assert) {
let eventNames = ["change", "click", "dblclick", "focus", "blur"];
- let eventComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectBooleanCheckboxevent\\:\\:field");
- let ajaxComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectBooleanCheckboxajax\\:\\:field");
+ let eventComponentFn = querySelectorFn("#page\\:mainForm\\:selectBooleanCheckboxevent\\:\\:field");
+ let ajaxComponentFn = querySelectorFn("#page\\:mainForm\\:selectBooleanCheckboxajax\\:\\:field");
let changeValue = function (componentFn) {
componentFn().checked = !componentFn().checked;
};
@@ -59,8 +59,8 @@ QUnit.test("tc:selectBooleanCheckbox", function (assert) {
QUnit.test("tc:textarea", function (assert) {
let eventNames = ["change", "click", "dblclick", "focus", "blur"];
- let eventComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:textareaevent\\:\\:field");
- let ajaxComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:textareaajax\\:\\:field");
+ let eventComponentFn = querySelectorFn("#page\\:mainForm\\:textareaevent\\:\\:field");
+ let ajaxComponentFn = querySelectorFn("#page\\:mainForm\\:textareaajax\\:\\:field");
let changeValue = function (componentFn) {
let oldValue = componentFn().value;
let newValue = "hello";
@@ -144,7 +144,7 @@ function testEvent(assert, componentName, eventNames, eventComponentFn, ajaxComp
}
function activateComponent(componentName, eventName) {
- const rows = testFrameQuerySelectorAllFn("#page\\:mainForm\\:componentTable .tobago-sheet-row")();
+ const rows = querySelectorAllFn("#page\\:mainForm\\:componentTable .tobago-sheet-row")();
Array.prototype.forEach.call(rows, function (element, i) {
if (element.querySelectorAll("td").item(0).querySelector(".tobago-out").textContent === componentName) {
const buttons = element.querySelectorAll("button");
@@ -159,21 +159,21 @@ function activateComponent(componentName, eventName) {
}
function getActionCount() {
- return parseInt(testFrameQuerySelectorFn("#page\\:mainForm\\:inAction\\:\\:field")().value);
+ return parseInt(querySelectorFn("#page\\:mainForm\\:inAction\\:\\:field")().value);
}
function getActionListenerCount() {
- return parseInt(testFrameQuerySelectorFn("#page\\:mainForm\\:inActionListener\\:\\:field")().value);
+ return parseInt(querySelectorFn("#page\\:mainForm\\:inActionListener\\:\\:field")().value);
}
function getAjaxListenerCount() {
- return parseInt(testFrameQuerySelectorFn("#page\\:mainForm\\:inAjaxListener\\:\\:field")().value);
+ return parseInt(querySelectorFn("#page\\:mainForm\\:inAjaxListener\\:\\:field")().value);
}
function getValueChangeListenerCount() {
- return parseInt(testFrameQuerySelectorFn("#page\\:mainForm\\:inValueChangeListener\\:\\:field")().value);
+ return parseInt(querySelectorFn("#page\\:mainForm\\:inValueChangeListener\\:\\:field")().value);
}
function getTimestamp() {
- return parseInt(testFrameQuerySelectorFn("#page\\:mainForm\\:inTimestamp\\:\\:field")().value);
+ return parseInt(querySelectorFn("#page\\:mainForm\\:inTimestamp\\:\\:field")().value);
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.test.js
index dfb4c79..b1a5ccf 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.test.js
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Simple Event", function (assert) {
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:simpleEvent");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:simpleEvent");
let oldCounterValues = getCounterValues();
let TTT = new TobagoTestTool(assert);
@@ -34,7 +34,7 @@ QUnit.test("Simple Event", function (assert) {
});
QUnit.test("Simple Ajax", function (assert) {
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:simpleAjax");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:simpleAjax");
let oldCounterValues = getCounterValues();
let TTT = new TobagoTestTool(assert);
@@ -49,7 +49,7 @@ QUnit.test("Simple Ajax", function (assert) {
});
QUnit.test("Simple EventAjax", function (assert) {
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:simpleEventAjax");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:simpleEventAjax");
let oldCounterValues = getCounterValues();
let TTT = new TobagoTestTool(assert);
@@ -65,42 +65,42 @@ QUnit.test("Simple EventAjax", function (assert) {
QUnit.test("Advanced Button: Option 1", function (assert) {
const optionId = 0; //Event 1 + no Ajax enabled
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:advancedButton");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:advancedButton");
testEventOption(assert, optionId, buttonFn, "dblclick", 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0);
});
QUnit.test("Advanced Button: Option 2", function (assert) {
const optionId = 1; //Event 2 + Ajax 3 enabled
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:advancedButton");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:advancedButton");
testAjaxOption(assert, optionId, buttonFn, "dblclick", 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1);
});
QUnit.test("Advanced Button: Option 3", function (assert) {
const optionId = 2; //Event 3 + all Ajax enabled
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:advancedButton");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:advancedButton");
testAjaxOption(assert, optionId, buttonFn, "click", 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1);
});
QUnit.test("Row: Option 1", function (assert) {
const optionId = 0; //Event 1 + no Ajax enabled
- let rowFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:row");
+ let rowFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:row");
testEventOption(assert, optionId, rowFn, "dblclick", 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0);
});
QUnit.test("Row: Option 2", function (assert) {
const optionId = 1; //Event 2 + Ajax 3 enabled
- let rowFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:row");
+ let rowFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:row");
testAjaxOption(assert, optionId, rowFn, "dblclick", 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1);
});
QUnit.test("Row: Option 3", function (assert) {
const optionId = 2; //Event 3 + all Ajax enabled
- let rowFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:row");
+ let rowFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:row");
testAjaxOption(assert, optionId, rowFn, "click", 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1);
});
QUnit.test("Input: Click Event", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inputClick\\:\\:field");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:inputClick\\:\\:field");
testInputSection(assert, inputFn, "click");
});
@@ -109,10 +109,10 @@ function testEventOption(assert, optionId, componentFn, eventName,
action1Plus, actionListener1Plus, ajaxListener1Plus,
action2Plus, actionListener2Plus, ajaxListener2Plus,
action3Plus, actionListener3Plus, ajaxListener3Plus) {
- let hideFn = testFrameQuerySelectorFn("#page\\:mainForm\\:hideOperationTextBox");
- let operationOutFn = testFrameQuerySelectorFn("#page\\:mainForm\\:operationOut");
+ let hideFn = querySelectorFn("#page\\:mainForm\\:hideOperationTextBox");
+ let operationOutFn = querySelectorFn("#page\\:mainForm\\:operationOut");
let oldCounterValues = getCounterValues();
- let optionsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:advancedSelector input[type='radio']");
+ let optionsFn = querySelectorAllFn("#page\\:mainForm\\:advancedSelector input[type='radio']");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -151,10 +151,10 @@ function testAjaxOption(assert, optionId, componentFn, eventName,
action1Plus, actionListener1Plus, ajaxListener1Plus,
action2Plus, actionListener2Plus, ajaxListener2Plus,
action3Plus, actionListener3Plus, ajaxListener3Plus) {
- let hideFn = testFrameQuerySelectorFn("#page\\:mainForm\\:hideOperationTextBox");
- let operationOutFn = testFrameQuerySelectorFn("#page\\:mainForm\\:operationOut");
+ let hideFn = querySelectorFn("#page\\:mainForm\\:hideOperationTextBox");
+ let operationOutFn = querySelectorFn("#page\\:mainForm\\:operationOut");
let oldCounterValues = getCounterValues();
- let optionsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:advancedSelector input[type='radio']");
+ let optionsFn = querySelectorAllFn("#page\\:mainForm\\:advancedSelector input[type='radio']");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -189,8 +189,8 @@ function testAjaxOption(assert, optionId, componentFn, eventName,
}
function testInputSection(assert, inputFn, eventName) {
- let hideFn = testFrameQuerySelectorFn("#page\\:mainForm\\:hideOperationTextBox");
- let operationOutFn = testFrameQuerySelectorFn("#page\\:mainForm\\:operationOut");
+ let hideFn = querySelectorFn("#page\\:mainForm\\:hideOperationTextBox");
+ let operationOutFn = querySelectorFn("#page\\:mainForm\\:operationOut");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -211,20 +211,20 @@ function testInputSection(assert, inputFn, eventName) {
}
function getCounterValues() {
- let buttonActionCounter = testFrameQuerySelectorFn("#page\\:mainForm\\:buttonActionCounter.tobago-out")().textContent;
- let buttonActionListenerCounter = testFrameQuerySelectorFn("#page\\:mainForm\\:buttonActionListenerCounter.tobago-out")().textContent;
+ let buttonActionCounter = querySelectorFn("#page\\:mainForm\\:buttonActionCounter.tobago-out")().textContent;
+ let buttonActionListenerCounter = querySelectorFn("#page\\:mainForm\\:buttonActionListenerCounter.tobago-out")().textContent;
- let actionCount1 = testFrameQuerySelectorFn("#page\\:mainForm\\:actionCounter1.tobago-out")().textContent;
- let actionListenerCount1 = testFrameQuerySelectorFn("#page\\:mainForm\\:actionListenerCounter1.tobago-out")().textContent;
- let ajaxListenerCount1 = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxListenerCounter1.tobago-out")().textContent;
+ let actionCount1 = querySelectorFn("#page\\:mainForm\\:actionCounter1.tobago-out")().textContent;
+ let actionListenerCount1 = querySelectorFn("#page\\:mainForm\\:actionListenerCounter1.tobago-out")().textContent;
+ let ajaxListenerCount1 = querySelectorFn("#page\\:mainForm\\:ajaxListenerCounter1.tobago-out")().textContent;
- let actionCount2 = testFrameQuerySelectorFn("#page\\:mainForm\\:actionCounter2.tobago-out")().textContent;
- let actionListenerCount2 = testFrameQuerySelectorFn("#page\\:mainForm\\:actionListenerCounter2.tobago-out")().textContent;
- let ajaxListenerCount2 = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxListenerCounter2.tobago-out")().textContent;
+ let actionCount2 = querySelectorFn("#page\\:mainForm\\:actionCounter2.tobago-out")().textContent;
+ let actionListenerCount2 = querySelectorFn("#page\\:mainForm\\:actionListenerCounter2.tobago-out")().textContent;
+ let ajaxListenerCount2 = querySelectorFn("#page\\:mainForm\\:ajaxListenerCounter2.tobago-out")().textContent;
- let actionCount3 = testFrameQuerySelectorFn("#page\\:mainForm\\:actionCounter3.tobago-out")().textContent;
- let actionListenerCount3 = testFrameQuerySelectorFn("#page\\:mainForm\\:actionListenerCounter3.tobago-out")().textContent;
- let ajaxListenerCount3 = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxListenerCounter3.tobago-out")().textContent;
+ let actionCount3 = querySelectorFn("#page\\:mainForm\\:actionCounter3.tobago-out")().textContent;
+ let actionListenerCount3 = querySelectorFn("#page\\:mainForm\\:actionListenerCounter3.tobago-out")().textContent;
+ let ajaxListenerCount3 = querySelectorFn("#page\\:mainForm\\:ajaxListenerCounter3.tobago-out")().textContent;
return [buttonActionCounter, buttonActionListenerCounter,
actionCount1, actionListenerCount1, ajaxListenerCount1,
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js b/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js
index f53ac48..a5cb2b2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js
@@ -37,19 +37,7 @@ function querySelectorAllFn(expression) {
}
}
-function testFrameQuerySelectorFn(expression) {
- return function () {
- return document.getElementById("page:testframe").contentWindow.document.querySelector(expression);
- }
-}
-
-function testFrameQuerySelectorAllFn(expression) {
- return function () {
- return document.getElementById("page:testframe").contentWindow.document.querySelectorAll(expression);
- }
-}
-
-export {elementByIdFn, querySelectorFn, querySelectorAllFn, testFrameQuerySelectorFn, testFrameQuerySelectorAllFn};
+export {elementByIdFn, querySelectorFn, querySelectorAllFn};
QUnit.test("wait for test", function (assert) {
let done = assert.async();
@@ -87,7 +75,7 @@ QUnit.test("duplicated IDs", function (assert) {
});
QUnit.test("test '???'", function (assert) {
- assert.ok(testFrameQuerySelectorFn("html")().textContent.indexOf("???") <= -1,
+ assert.ok(querySelectorFn("html")().textContent.indexOf("???") <= -1,
"There must no '???' on the site.");
});
@@ -119,7 +107,7 @@ describe("general", function () {
});
it("test '???", function () {
- let result = testFrameQuerySelectorFn("html")().textContent;
+ let result = querySelectorFn("html")().textContent;
expect(result.indexOf("???")).toBeLessThanOrEqual(-1, "There must no '???' on the site.");
});