myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hno...@apache.org
Subject [myfaces-tobago] branch master updated: integration tests: remove jQuery
Date Tue, 20 Aug 2019 16:48:24 GMT
This is an automated email from the ASF dual-hosted git repository.

hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new fec1408  integration tests: remove jQuery
fec1408 is described below

commit fec1408a6709f9515bfb01e6ff41a32654a30760
Author: Henning Noeth <hnoeth@apache.org>
AuthorDate: Tue Aug 20 18:48:11 2019 +0200

    integration tests: remove jQuery
---
 .../010-input/20-suggest/Suggest.test.js           |  95 ++++---
 .../010-input/50-input-group/Group.test.js         |  84 +++---
 .../050-container/40-section/Section.test.js       |   8 +-
 .../080-sheet/10-sort/Sheet_Sorting.test.js        | 306 ++++++++++-----------
 .../080-sheet/70-tree/Sheet_Tree.test.js           |  78 +++---
 .../1020-suggest-quotMark/Suggest_QuotMark.test.js |  33 +--
 .../40-test/1041-date-pattern/Date_Pattern.test.js |   1 -
 .../40-test/2500-tab/Tabgroup_Style.test.js        |  56 ++--
 8 files changed, 337 insertions(+), 324 deletions(-)

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 c14da03..5054d6a 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,89 +15,92 @@
  * limitations under the License.
  */
 
-import {jQueryFrame, jQueryFrameFn} from "/script/tobago-test.js";
+import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
 import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
 
 QUnit.test("Basics: 'M'", function (assert) {
-  var inputString = "M";
-  var expectedLength = 10;
+  let inputString = "M";
+  let expectedLength = 10;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Ma'", function (assert) {
-  var inputString = "Ma";
-  var expectedLength = 4;
+  let inputString = "Ma";
+  let expectedLength = 4;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Mar'", function (assert) {
-  var inputString = "Mar";
-  var expectedLength = 1;
+  let inputString = "Mar";
+  let expectedLength = 1;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Mars'", function (assert) {
-  var inputString = "Mars";
-  var expectedLength = 1;
+  let inputString = "Mars";
+  let expectedLength = 1;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 function testMarsBasics(assert, inputString, expectedLength) {
-  var inFn = jQueryFrameFn("#page\\:mainForm\\:inBasic\\:\\:field");
-  var suggestionsFn = getSuggestions("#page\\:mainForm\\:inBasic");
+  let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inBasic\\:\\:field");
+  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inBasic");
 
-  var TTT = new TobagoTestTool(assert);
+  let TTT = new TobagoTestTool(assert);
   TTT.action(function () {
-    inFn().val(inputString).trigger('input');
+    inFn().value = inputString;
+    inFn().dispatchEvent(new Event('input'));
   });
   TTT.waitForResponse();
   TTT.asserts(expectedLength + 1, function () {
     assert.equal(suggestionsFn().length, expectedLength);
     for (let i = 0; i < expectedLength; i++) {
-      assert.ok(suggestionsFn().eq(i).find("strong").text().toUpperCase().indexOf(inputString.toUpperCase()) >= 0);
+      assert.ok(suggestionsFn().item(i).querySelector("strong").textContent.toUpperCase().indexOf(inputString.toUpperCase()) >= 0);
     }
   });
   TTT.startTest();
 }
 
 QUnit.test("Basics: Add 'eus' and click first entry.", function (assert) {
-  var inFn = jQueryFrameFn("#page\\:mainForm\\:inBasic\\:\\:field");
-  var suggestionsFn = getSuggestions("#page\\:mainForm\\:inBasic");
+  let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inBasic\\:\\:field");
+  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inBasic");
 
-  var TTT = new TobagoTestTool(assert);
+  let TTT = new TobagoTestTool(assert);
   TTT.action(function () {
-    inFn().val("eus").trigger('input');
+    inFn().value = "eus";
+    inFn().dispatchEvent(new Event('input'));
   });
   TTT.waitForResponse();
   TTT.asserts(5, function () {
-    assert.equal(inFn().val(), "eus");
+    assert.equal(inFn().value, "eus");
     assert.equal(suggestionsFn().length, 3);
-    assert.equal(suggestionsFn().eq(0).find("strong").text(), "eus");
-    assert.equal(suggestionsFn().eq(1).find("strong").text(), "eus");
-    assert.equal(suggestionsFn().eq(2).find("strong").text(), "eus");
+    assert.equal(suggestionsFn().item(0).querySelector("strong").textContent, "eus");
+    assert.equal(suggestionsFn().item(1).querySelector("strong").textContent, "eus");
+    assert.equal(suggestionsFn().item(2).querySelector("strong").textContent, "eus");
   });
   TTT.action(function () {
-    suggestionsFn().eq(0).click();
+    suggestionsFn().item(0).click();
   });
   TTT.asserts(1, function () {
-    assert.equal(inFn().val(), "Prometheus");
+    assert.equal(inFn().value, "Prometheus");
 
   });
   TTT.startTest();
 });
 
 QUnit.test("Advanced: 'C'", function (assert) {
-  var inFn = jQueryFrameFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
-  var suggestionsFn = getSuggestions("#page\\:mainForm\\:inAdvanced");
-  var suggestionDelay = 2000;
+  let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
+  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inAdvanced");
+  let suggestionDelay = 2000;
 
-  var TTT = new TobagoTestTool(assert);
+  let TTT = new TobagoTestTool(assert);
   TTT.action(function () {
-    inFn().val("C").trigger('input');
+    inFn().value = "C";
+    inFn().dispatchEvent(new Event('input'));
   });
   TTT.waitMs(suggestionDelay);
   TTT.asserts(1, function () {
@@ -107,14 +110,15 @@ QUnit.test("Advanced: 'C'", function (assert) {
 });
 
 QUnit.test("Advanced: 'Ca'", function (assert) {
-  var inFn = jQueryFrameFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
-  var suggestionsFn = getSuggestions("#page\\:mainForm\\:inAdvanced");
-  var suggestionDelay = 2000;
-  var startTime = Date.now();
+  let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
+  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inAdvanced");
+  let suggestionDelay = 2000;
+  let startTime = Date.now();
 
-  var TTT = new TobagoTestTool(assert);
+  let TTT = new TobagoTestTool(assert);
   TTT.action(function () {
-    inFn().val("Ca").trigger('input');
+    inFn().value = "Ca";
+    inFn().dispatchEvent(new Event('input'));
   });
   TTT.waitMs(200); // default suggestion delay
   TTT.asserts(1, function () {
@@ -124,8 +128,8 @@ QUnit.test("Advanced: 'Ca'", function (assert) {
   TTT.waitForResponse();
   TTT.asserts(4, function () {
     assert.equal(suggestionsFn().length, 2);
-    assert.equal(suggestionsFn().eq(0).find("strong").text(), "Ca");
-    assert.equal(suggestionsFn().eq(1).find("strong").text(), "Ca");
+    assert.equal(suggestionsFn().item(0).querySelector("strong").textContent, "Ca");
+    assert.equal(suggestionsFn().item(1).querySelector("strong").textContent, "Ca");
     assert.ok(Date.now() - startTime >= suggestionDelay, "Delay for suggest popup must be greater/equal "
         + suggestionDelay);
   });
@@ -133,17 +137,18 @@ QUnit.test("Advanced: 'Ca'", function (assert) {
 });
 
 QUnit.test("Client side: 'Ju'", function (assert) {
-  var inFn = jQueryFrameFn("#page\\:mainForm\\:inClient\\:\\:field");
-  var suggestionsFn = getSuggestions("#page\\:mainForm\\:inClient");
+  let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inClient\\:\\:field");
+  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inClient");
 
-  var TTT = new TobagoTestTool(assert);
+  let TTT = new TobagoTestTool(assert);
   TTT.action(function () {
-    inFn().val("Ju").trigger('input');
+    inFn().value = "Ju";
+    inFn().dispatchEvent(new Event('input'));
   });
   TTT.asserts(3, function () {
     assert.equal(suggestionsFn().length, 2);
-    assert.equal(suggestionsFn().eq(0).find("strong").text(), "Ju");
-    assert.equal(suggestionsFn().eq(1).find("strong").text(), "Ju");
+    assert.equal(suggestionsFn().item(0).querySelector("strong").textContent, "Ju");
+    assert.equal(suggestionsFn().item(1).querySelector("strong").textContent, "Ju");
   });
   TTT.startTest();
 });
@@ -153,6 +158,6 @@ function escapeClientId(clientId) {
 }
 
 function getSuggestions(id) {
-  return jQueryFrameFn(escapeClientId(
-      jQueryFrame(id + " tobago-suggest").attr("id") + "::popup") + " .tt-suggestion");
+  return testFrameQuerySelectorAllFn(escapeClientId(
+      testFrameQuerySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
 }
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 179cce1..be24022 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,49 +15,49 @@
  * limitations under the License.
  */
 
-import {jQueryFrameFn} from "/script/tobago-test.js";
+import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
 import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
 
 QUnit.test("ajax: chat send button", function (assert) {
-  var chatlogFn = jQueryFrameFn("#page\\:mainForm\\:tachatlog\\:\\:field");
-  var inputFn = jQueryFrameFn("#page\\:mainForm\\:inewmessage\\:\\:field");
-  var sendButtonFn = jQueryFrameFn("#page\\:mainForm\\:sendButton");
+  let chatlogFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tachatlog\\:\\:field");
+  let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inewmessage\\:\\:field");
+  let sendButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sendButton");
 
-  var TTT = new TobagoTestTool(assert);
+  let TTT = new TobagoTestTool(assert);
   TTT.action(function () {
-    inputFn().val("delete chat");
+    inputFn().value = "delete chat";
     sendButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal(chatlogFn().text(), "");
+    assert.equal(chatlogFn().textContent, "");
   });
   TTT.action(function () {
-    inputFn().val("Hi Peter, how are you?");
+    inputFn().value = "Hi Peter, how are you?";
     sendButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal(chatlogFn().text(), "User Two: Hi Peter, how are you?");
+    assert.equal(chatlogFn().textContent, "User Two: Hi Peter, how are you?");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: dropdown button", function (assert) {
-  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:lsendtoc\\:\\:command");
-  var buttonLabelFn = jQueryFrameFn("#page\\:mainForm\\:lsendtoc\\:\\:command span");
-  var sendToPeterFn = jQueryFrameFn("#page\\:mainForm\\:sendToPeter");
-  var sendToBobFn = jQueryFrameFn("#page\\:mainForm\\:sendToBob");
-  var sendToAllFn = jQueryFrameFn("#page\\:mainForm\\:sendToAll");
+  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");
 
-  var TTT = new TobagoTestTool(assert);
+  let TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     buttonFn().click();
     sendToPeterFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal(buttonLabelFn().text(), "SendTo: Peter");
+    assert.equal(buttonLabelFn().textContent, "SendTo: Peter");
   });
   TTT.action(function () {
     buttonFn().click();
@@ -65,7 +65,7 @@ QUnit.test("ajax: dropdown button", function (assert) {
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal(buttonLabelFn().text(), "SendTo: Bob");
+    assert.equal(buttonLabelFn().textContent, "SendTo: Bob");
   });
   TTT.action(function () {
     buttonFn().click();
@@ -73,49 +73,53 @@ QUnit.test("ajax: dropdown button", function (assert) {
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal(buttonLabelFn().text(), "SendTo: All");
+    assert.equal(buttonLabelFn().textContent, "SendTo: All");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: currency change event", function (assert) {
-  var currencyInputFn = jQueryFrameFn("#page\\:mainForm\\:value\\:\\:field");
-  var currencyOptionFn = jQueryFrameFn("#page\\:mainForm\\:currency option");
-  var outputFieldFn = jQueryFrameFn("#page\\:mainForm\\:valueInEuro .tobago-out");
+  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");
 
-  var TTT = new TobagoTestTool(assert);
+  let TTT = new TobagoTestTool(assert);
   TTT.action(function () {
-    currencyInputFn().val("1000");
-    currencyOptionFn().eq(1).prop("selected", false);
-    currencyOptionFn().eq(2).prop("selected", false);
-    currencyOptionFn().eq(3).prop("selected", false);
-    currencyOptionFn().eq(0).prop("selected", true).trigger("change"); // Yen
+    currencyInputFn().value = "1000";
+    currencyOptionFn().item(1).selected = false;
+    currencyOptionFn().item(2).selected = false;
+    currencyOptionFn().item(3).selected = false;
+    currencyOptionFn().item(0).selected = true; // Yen
+    currencyFn().dispatchEvent(new Event('change'));
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal(outputFieldFn().text(), "8,85");
+    assert.equal(outputFieldFn().textContent, "8,85");
   });
   TTT.action(function () {
-    currencyInputFn().val("2000");
-    currencyOptionFn().eq(0).prop("selected", false);
-    currencyOptionFn().eq(2).prop("selected", false);
-    currencyOptionFn().eq(3).prop("selected", false);
-    currencyOptionFn().eq(1).prop("selected", true).trigger("change"); // Trinidad-Tobago Dollar
+    currencyInputFn().value = "2000";
+    currencyOptionFn().item(0).selected = false;
+    currencyOptionFn().item(2).selected = false;
+    currencyOptionFn().item(3).selected = false;
+    currencyOptionFn().item(1).selected = true; // Trinidad-Tobago Dollar
+    currencyFn().dispatchEvent(new Event('change'));
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal(outputFieldFn().text(), "267,50");
+    assert.equal(outputFieldFn().textContent, "267,50");
   });
   TTT.action(function () {
-    currencyInputFn().val("3000");
-    currencyOptionFn().eq(0).prop("selected", false);
-    currencyOptionFn().eq(1).prop("selected", false);
-    currencyOptionFn().eq(3).prop("selected", false);
-    currencyOptionFn().eq(2).prop("selected", true).trigger("change"); // US Dollar
+    currencyInputFn().value = "3000";
+    currencyOptionFn().item(0).selected = false;
+    currencyOptionFn().item(1).selected = false;
+    currencyOptionFn().item(3).selected = false;
+    currencyOptionFn().item(2).selected = true; // US Dollar
+    currencyFn().dispatchEvent(new Event('change'));
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal(outputFieldFn().text(), "2.688,29");
+    assert.equal(outputFieldFn().textContent, "2.688,29");
   });
   TTT.startTest();
 });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/Section.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/Section.test.js
index 1eefe83..01a4955 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/Section.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/Section.test.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import {jQueryFrame} from "/script/tobago-test.js";
+import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
 
 QUnit.test("Attribute 'level'", function (assert) {
   assert.expect(1);
 
-  var $sectionLevel5 = jQueryFrame("#page\\:mainForm\\:sectionLevel5");
-  var $header5 = $sectionLevel5.find("h5");
+  let sectionLevel5Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionLevel5");
+  let header5 = sectionLevel5Fn().querySelector("h5");
 
-  assert.equal($header5.length, 1);
+  assert.ok(header5 !== null);
 });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/Sheet_Sorting.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/Sheet_Sorting.test.js
index 083dfd3..f8d99d2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/Sheet_Sorting.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/Sheet_Sorting.test.js
@@ -15,25 +15,25 @@
  * limitations under the License.
  */
 
-import {jQueryFrameFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
 import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
 
 QUnit.test("Basics: Name", function (assert) {
-  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  let colNameFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1\\:columnName_sorter");
+  let rowsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTool(assert);
-  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
+  let TTT = new TobagoTestTool(assert);
+  if (!colNameFn().classList.contains("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().classList.contains("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
     leftPagingFn().value = "22";
@@ -73,21 +73,21 @@ QUnit.test("Basics: Name", function (assert) {
 });
 
 QUnit.test("Basics: Period", function (assert) {
-  var colPeriodFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnPeriod_sorter");
-  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  let colPeriodFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1\\:columnPeriod_sorter");
+  let rowsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTool(assert);
-  if (!colPeriodFn().hasClass("tobago-sheet-header-markup-ascending")) {
+  let TTT = new TobagoTestTool(assert);
+  if (!colPeriodFn().classList.contains("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colPeriodFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok(colPeriodFn().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok(colPeriodFn().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk(colPeriodFn().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colPeriodFn().classList.contains("tobago-sheet-header-markup-sortable"));
+    assert.ok(colPeriodFn().classList.contains("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colPeriodFn().classList.contains("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
     leftPagingFn().value = "29";
@@ -127,21 +127,21 @@ QUnit.test("Basics: Period", function (assert) {
 });
 
 QUnit.test("Basics: Year", function (assert) {
-  var colYearFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnDiscoverYear_sorter");
-  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  let colYearFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1\\:columnDiscoverYear_sorter");
+  let rowsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTool(assert);
-  if (!colYearFn().hasClass("tobago-sheet-header-markup-ascending")) {
+  let TTT = new TobagoTestTool(assert);
+  if (!colYearFn().classList.contains("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colYearFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok(colYearFn().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok(colYearFn().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk(colYearFn().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colYearFn().classList.contains("tobago-sheet-header-markup-sortable"));
+    assert.ok(colYearFn().classList.contains("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colYearFn().classList.contains("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
     leftPagingFn().value = "22";
@@ -149,30 +149,30 @@ QUnit.test("Basics: Year", function (assert) {
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal(rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1892", "row0col2");
-    assert.equal(rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1898", "row1col2");
-    assert.equal(rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1904", "row2col2");
-    assert.equal(rowsFn().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1905", "row3col2");
+    assert.equal(rowsFn().item(0).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1892", "row0col2");
+    assert.equal(rowsFn().item(1).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1898", "row1col2");
+    assert.equal(rowsFn().item(2).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1904", "row2col2");
+    assert.equal(rowsFn().item(3).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1905", "row3col2");
   });
   TTT.action(function () {
     colYearFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal(rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1999", "row0col2");
-    assert.equal(rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1999", "row1col2");
-    assert.equal(rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1997", "row2col2");
-    assert.equal(rowsFn().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1997", "row3col2");
+    assert.equal(rowsFn().item(0).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1999", "row0col2");
+    assert.equal(rowsFn().item(1).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1999", "row1col2");
+    assert.equal(rowsFn().item(2).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1997", "row2col2");
+    assert.equal(rowsFn().item(3).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1997", "row3col2");
   });
   TTT.action(function () {
     colYearFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal(rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1892", "row0col2");
-    assert.equal(rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1898", "row1col2");
-    assert.equal(rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1904", "row2col2");
-    assert.equal(rowsFn().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1905", "row3col2");
+    assert.equal(rowsFn().item(0).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1892", "row0col2");
+    assert.equal(rowsFn().item(1).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1898", "row1col2");
+    assert.equal(rowsFn().item(2).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1904", "row2col2");
+    assert.equal(rowsFn().item(3).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1905", "row3col2");
   });
   TTT.startTest();
 });
@@ -182,21 +182,21 @@ QUnit.test("Basics: Year", function (assert) {
  * 2. goto line 9
  */
 QUnit.test("Basics: left paging", function (assert) {
-  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  let colNameFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1\\:columnName_sorter");
+  let rowsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTool(assert);
-  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
+  let TTT = new TobagoTestTool(assert);
+  if (!colNameFn().classList.contains("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().classList.contains("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
     leftPagingFn().value = "8";
@@ -231,22 +231,22 @@ QUnit.test("Basics: left paging", function (assert) {
  * 3. goto page 13
  */
 QUnit.test("Basics: center paging", function (assert) {
-  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
-  var centerPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-center li .page-link");
+  let colNameFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1\\:columnName_sorter");
+  let rowsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  let centerPagingFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-center li .page-link");
 
-  var TTT = new TobagoTestTool(assert);
-  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
+  let TTT = new TobagoTestTool(assert);
+  if (!colNameFn().classList.contains("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().classList.contains("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
     leftPagingFn().value = "1";
@@ -261,7 +261,7 @@ QUnit.test("Basics: center paging", function (assert) {
         "Ananke", "-629.77", "1951");
   });
   TTT.action(function () {
-    centerPagingFn().eq(6).click();
+    centerPagingFn().item(6).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
@@ -272,7 +272,7 @@ QUnit.test("Basics: center paging", function (assert) {
         "Galatea", "0.43", "1989");
   });
   TTT.action(function () {
-    centerPagingFn().eq(10).click();
+    centerPagingFn().item(10).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
@@ -283,7 +283,7 @@ QUnit.test("Basics: center paging", function (assert) {
         "Praxidike", "625.3", "2000");
   });
   TTT.action(function () {
-    centerPagingFn().eq(3).click();
+    centerPagingFn().item(3).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
@@ -304,23 +304,23 @@ QUnit.test("Basics: center paging", function (assert) {
  * 5. goto page 14
  */
 QUnit.test("Basics: right paging", function (assert) {
-  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
-  var rightPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-right .page-link");
-  var jumpToPageFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-right .page-link input");
+  let colNameFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1\\:columnName_sorter");
+  let rowsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  let rightPagingFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-right .page-link");
+  let jumpToPageFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-right .page-link input");
 
-  var TTT = new TobagoTestTool(assert);
-  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
+  let TTT = new TobagoTestTool(assert);
+  if (!colNameFn().classList.contains("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().classList.contains("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
     leftPagingFn().value = "22";
@@ -335,7 +335,7 @@ QUnit.test("Basics: right paging", function (assert) {
         "Epimetheus", "0.69", "1980");
   });
   TTT.action(function () {
-    rightPagingFn().eq(0).click();
+    rightPagingFn().item(0).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
@@ -346,7 +346,7 @@ QUnit.test("Basics: right paging", function (assert) {
         "Ananke", "-629.77", "1951");
   });
   TTT.action(function () {
-    rightPagingFn().eq(3).click();
+    rightPagingFn().item(3).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
@@ -357,7 +357,7 @@ QUnit.test("Basics: right paging", function (assert) {
         "Bianca", "0.43", "1986");
   });
   TTT.action(function () {
-    rightPagingFn().eq(4).click();
+    rightPagingFn().item(4).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
@@ -368,7 +368,7 @@ QUnit.test("Basics: right paging", function (assert) {
         "Venus", "224.7", "");
   });
   TTT.action(function () {
-    rightPagingFn().eq(1).click();
+    rightPagingFn().item(1).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
@@ -394,21 +394,21 @@ QUnit.test("Basics: right paging", function (assert) {
 });
 
 QUnit.test("Custom Sorting: Name", function (assert) {
-  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  let colNameFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
+  let rowsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTool(assert);
-  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
+  let TTT = new TobagoTestTool(assert);
+  if (!colNameFn().classList.contains("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().classList.contains("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
     leftPagingFn().value = "22";
@@ -448,21 +448,21 @@ QUnit.test("Custom Sorting: Name", function (assert) {
 });
 
 QUnit.test("Custom Sorting: Period", function (assert) {
-  var colPeriodFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnPeriod_sorter");
-  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  let colPeriodFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2\\:customColumnPeriod_sorter");
+  let rowsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTool(assert);
-  if (!colPeriodFn().hasClass("tobago-sheet-header-markup-ascending")) {
+  let TTT = new TobagoTestTool(assert);
+  if (!colPeriodFn().classList.contains("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colPeriodFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok(colPeriodFn().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok(colPeriodFn().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk(colPeriodFn().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colPeriodFn().classList.contains("tobago-sheet-header-markup-sortable"));
+    assert.ok(colPeriodFn().classList.contains("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colPeriodFn().classList.contains("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
     leftPagingFn().value = "29";
@@ -502,21 +502,21 @@ QUnit.test("Custom Sorting: Period", function (assert) {
 });
 
 QUnit.test("Custom Sorting: Year", function (assert) {
-  var colYearFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnYear_sorter");
-  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  let colYearFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2\\:customColumnYear_sorter");
+  let rowsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTool(assert);
-  if (!colYearFn().hasClass("tobago-sheet-header-markup-ascending")) {
+  let TTT = new TobagoTestTool(assert);
+  if (!colYearFn().classList.contains("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colYearFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok(colYearFn().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok(colYearFn().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk(colYearFn().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colYearFn().classList.contains("tobago-sheet-header-markup-sortable"));
+    assert.ok(colYearFn().classList.contains("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colYearFn().classList.contains("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
     leftPagingFn().value = "22";
@@ -524,30 +524,30 @@ QUnit.test("Custom Sorting: Year", function (assert) {
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal(rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1789", "row0col2");
-    assert.equal(rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row1col2");
-    assert.equal(rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row2col2");
-    assert.equal(rowsFn().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1848", "row3col2");
+    assert.equal(rowsFn().item(0).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1789", "row0col2");
+    assert.equal(rowsFn().item(1).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1846", "row1col2");
+    assert.equal(rowsFn().item(2).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1846", "row2col2");
+    assert.equal(rowsFn().item(3).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1848", "row3col2");
   });
   TTT.action(function () {
     colYearFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal(rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row0col2");
-    assert.equal(rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row1col2");
-    assert.equal(rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row2col2");
-    assert.equal(rowsFn().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1986", "row3col2");
+    assert.equal(rowsFn().item(0).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1989", "row0col2");
+    assert.equal(rowsFn().item(1).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1989", "row1col2");
+    assert.equal(rowsFn().item(2).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1989", "row2col2");
+    assert.equal(rowsFn().item(3).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1986", "row3col2");
   });
   TTT.action(function () {
     colYearFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal(rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1789", "row0col2");
-    assert.equal(rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row1col2");
-    assert.equal(rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row2col2");
-    assert.equal(rowsFn().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1848", "row3col2");
+    assert.equal(rowsFn().item(0).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1789", "row0col2");
+    assert.equal(rowsFn().item(1).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1846", "row1col2");
+    assert.equal(rowsFn().item(2).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1846", "row2col2");
+    assert.equal(rowsFn().item(3).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim(), "1848", "row3col2");
   });
   TTT.startTest();
 });
@@ -557,21 +557,21 @@ QUnit.test("Custom Sorting: Year", function (assert) {
  * 2. goto line 9
  */
 QUnit.test("Custom Sorting: left paging", function (assert) {
-  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  let colNameFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
+  let rowsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTool(assert);
-  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
+  let TTT = new TobagoTestTool(assert);
+  if (!colNameFn().classList.contains("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().classList.contains("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
     leftPagingFn().value = "8";
@@ -606,22 +606,22 @@ QUnit.test("Custom Sorting: left paging", function (assert) {
  * 3. goto page 13
  */
 QUnit.test("Custom Sorting: center paging", function (assert) {
-  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
-  var centerPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-center li .page-link");
+  let colNameFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
+  let rowsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  let centerPagingFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-center li .page-link");
 
-  var TTT = new TobagoTestTool(assert);
-  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
+  let TTT = new TobagoTestTool(assert);
+  if (!colNameFn().classList.contains("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().classList.contains("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
     leftPagingFn().value = "1";
@@ -636,7 +636,7 @@ QUnit.test("Custom Sorting: center paging", function (assert) {
         "Ananke", "-629.77", "1951");
   });
   TTT.action(function () {
-    centerPagingFn().eq(6).click();
+    centerPagingFn().item(6).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
@@ -647,7 +647,7 @@ QUnit.test("Custom Sorting: center paging", function (assert) {
         "Galatea", "0.43", "1989");
   });
   TTT.action(function () {
-    centerPagingFn().eq(10).click();
+    centerPagingFn().item(10).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
@@ -658,7 +658,7 @@ QUnit.test("Custom Sorting: center paging", function (assert) {
         "Praxidike", "625.3", "2000");
   });
   TTT.action(function () {
-    centerPagingFn().eq(3).click();
+    centerPagingFn().item(3).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
@@ -679,23 +679,23 @@ QUnit.test("Custom Sorting: center paging", function (assert) {
  * 5. goto page 14
  */
 QUnit.test("Custom Sorting: right paging", function (assert) {
-  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
-  var rightPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-right .page-link");
-  var rightPagingInputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-right .page-link input");
+  let colNameFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
+  let rowsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let leftPagingFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  let rightPagingFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-right .page-link");
+  let rightPagingInputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-right .page-link input");
 
-  var TTT = new TobagoTestTool(assert);
-  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
+  let TTT = new TobagoTestTool(assert);
+  if (!colNameFn().classList.contains("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().classList.contains("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().classList.contains("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
     leftPagingFn().value = "22";
@@ -710,7 +710,7 @@ QUnit.test("Custom Sorting: right paging", function (assert) {
         "Epimetheus", "0.69", "1980");
   });
   TTT.action(function () {
-    rightPagingFn().eq(0).click();
+    rightPagingFn().item(0).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
@@ -721,7 +721,7 @@ QUnit.test("Custom Sorting: right paging", function (assert) {
         "Ananke", "-629.77", "1951");
   });
   TTT.action(function () {
-    rightPagingFn().eq(3).click();
+    rightPagingFn().item(3).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
@@ -732,7 +732,7 @@ QUnit.test("Custom Sorting: right paging", function (assert) {
         "Bianca", "0.43", "1986");
   });
   TTT.action(function () {
-    rightPagingFn().eq(4).click();
+    rightPagingFn().item(4).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
@@ -743,7 +743,7 @@ QUnit.test("Custom Sorting: right paging", function (assert) {
         "Venus", "224.7", "");
   });
   TTT.action(function () {
-    rightPagingFn().eq(1).click();
+    rightPagingFn().item(1).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
@@ -770,18 +770,18 @@ QUnit.test("Custom Sorting: right paging", function (assert) {
 
 function ajaxExecuteBodyTableCheck(assert, rowsFn, row0col0, row0col1, row0col2, row1col0, row1col1, row1col2,
                                    row2col0, row2col1, row2col2, row3col0, row3col1, row3col2) {
-  var $row0Col0 = rowsFn().eq(0).find(".tobago-sheet-cell").eq(0).text().trim();
-  var $row0Col1 = rowsFn().eq(0).find(".tobago-sheet-cell").eq(1).text().trim();
-  var $row0Col2 = rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim();
-  var $row1Col0 = rowsFn().eq(1).find(".tobago-sheet-cell").eq(0).text().trim();
-  var $row1Col1 = rowsFn().eq(1).find(".tobago-sheet-cell").eq(1).text().trim();
-  var $row1Col2 = rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim();
-  var $row2Col0 = rowsFn().eq(2).find(".tobago-sheet-cell").eq(0).text().trim();
-  var $row2Col1 = rowsFn().eq(2).find(".tobago-sheet-cell").eq(1).text().trim();
-  var $row2Col2 = rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim();
-  var $row3Col0 = rowsFn().eq(3).find(".tobago-sheet-cell").eq(0).text().trim();
-  var $row3Col1 = rowsFn().eq(3).find(".tobago-sheet-cell").eq(1).text().trim();
-  var $row3Col2 = rowsFn().eq(3).find(".tobago-sheet-cell").eq(2).text().trim();
+  let $row0Col0 = rowsFn().item(0).querySelectorAll(".tobago-sheet-cell").item(0).textContent.trim();
+  let $row0Col1 = rowsFn().item(0).querySelectorAll(".tobago-sheet-cell").item(1).textContent.trim();
+  let $row0Col2 = rowsFn().item(0).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim();
+  let $row1Col0 = rowsFn().item(1).querySelectorAll(".tobago-sheet-cell").item(0).textContent.trim();
+  let $row1Col1 = rowsFn().item(1).querySelectorAll(".tobago-sheet-cell").item(1).textContent.trim();
+  let $row1Col2 = rowsFn().item(1).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim();
+  let $row2Col0 = rowsFn().item(2).querySelectorAll(".tobago-sheet-cell").item(0).textContent.trim();
+  let $row2Col1 = rowsFn().item(2).querySelectorAll(".tobago-sheet-cell").item(1).textContent.trim();
+  let $row2Col2 = rowsFn().item(2).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim();
+  let $row3Col0 = rowsFn().item(3).querySelectorAll(".tobago-sheet-cell").item(0).textContent.trim();
+  let $row3Col1 = rowsFn().item(3).querySelectorAll(".tobago-sheet-cell").item(1).textContent.trim();
+  let $row3Col2 = rowsFn().item(3).querySelectorAll(".tobago-sheet-cell").item(2).textContent.trim();
 
   assert.equal($row0Col0, row0col0, "row0col0");
   assert.equal($row0Col1, row0col1, "row0col1");
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 72c1237..52d5e9a 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,54 +15,58 @@
  * limitations under the License.
  */
 
-import {jQueryFrameFn} from "/script/tobago-test.js";
+import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
 import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
 
 QUnit.test("Collapse tree", function (assert) {
-  var row0nameFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:nameOut");
-  var row0centralBodyFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:centralBodyOut");
-  var row0distanceFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:distanceOut");
-  var row0periodFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:periodOut");
-  var row0discovererFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:discovererOut");
-  var row0yearFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:yearOut");
-  var row1nameFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:1\\:nameOut");
-  var row1centralBodyFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:1\\:centralBodyOut");
-  var row1distanceFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:1\\:distanceOut");
-  var row1periodFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:1\\:periodOut");
-  var row1discovererFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:1\\:discovererOut");
-  var row1yearFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:1\\:yearOut");
-  var rootTreeButtonFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:nameCol .tobago-treeNode-toggle");
+  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");
 
-  var TTT = new TobagoTestTool(assert);
-  TTT.asserts(13, function () {
-    assert.equal(row0nameFn().text(), "Sun");
-    assert.equal(row0centralBodyFn().text(), "-");
-    assert.equal(row0distanceFn().text(), "0");
-    assert.equal(row0periodFn().text(), "0.0");
-    assert.equal(row0discovererFn().text(), "-");
-    assert.equal(row0yearFn().text(), "");
-    assert.equal(row1nameFn().text(), "Mercury");
-    assert.equal(row1centralBodyFn().text(), "Sun");
-    assert.equal(row1distanceFn().text(), "57910");
-    assert.equal(row1periodFn().text(), "87.97");
-    assert.equal(row1discovererFn().text(), "-");
-    assert.equal(row1yearFn().text(), "");
+  let TTT = new TobagoTestTool(assert);
+  TTT.asserts(14, function () {
+    assert.equal(row0nameFn().textContent, "Sun");
+    assert.equal(row0centralBodyFn().textContent, "-");
+    assert.equal(row0distanceFn().textContent, "0");
+    assert.equal(row0periodFn().textContent, "0.0");
+    assert.equal(row0discovererFn().textContent, "-");
+    assert.equal(row0yearFn().textContent, "");
+    assert.equal(row1nameFn().textContent, "Mercury");
+    assert.equal(row1centralBodyFn().textContent, "Sun");
+    assert.equal(row1distanceFn().textContent, "57910");
+    assert.equal(row1periodFn().textContent, "87.97");
+    assert.equal(row1discovererFn().textContent, "-");
+    assert.equal(row1yearFn().textContent, "");
 
-    assert.notEqual(row1yearFn().parents(".tobago-sheet-row").css("display"), "none");
+    let sheetRow = row1yearFn().parentElement.parentElement;
+    assert.ok(sheetRow.classList.contains("tobago-sheet-row"));
+    assert.notEqual(getComputedStyle(sheetRow).display, "none");
   });
   TTT.action(function () {
     rootTreeButtonFn().click();
   });
   TTT.waitMs(1000);
-  TTT.asserts(7, function () {
-    assert.equal(row0nameFn().text(), "Sun");
-    assert.equal(row0centralBodyFn().text(), "-");
-    assert.equal(row0distanceFn().text(), "0");
-    assert.equal(row0periodFn().text(), "0.0");
-    assert.equal(row0discovererFn().text(), "-");
-    assert.equal(row0yearFn().text(), "");
+  TTT.asserts(8, function () {
+    assert.equal(row0nameFn().textContent, "Sun");
+    assert.equal(row0centralBodyFn().textContent, "-");
+    assert.equal(row0distanceFn().textContent, "0");
+    assert.equal(row0periodFn().textContent, "0.0");
+    assert.equal(row0discovererFn().textContent, "-");
+    assert.equal(row0yearFn().textContent, "");
 
-    assert.equal(row1yearFn().parents(".tobago-sheet-row").css("display"), "none");
+    let sheetRow = row1yearFn().parentElement.parentElement;
+    assert.ok(sheetRow.classList.contains("tobago-sheet-row"));
+    assert.equal(getComputedStyle(sheetRow).display, "none");
   });
   TTT.startTest();
 });
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 96bc2c1..eab97ce 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,50 +15,51 @@
  * limitations under the License.
  */
 
-import {jQueryFrame, jQueryFrameFn} from "/script/tobago-test.js";
+import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
 import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
 
 QUnit.test("Basics: 'M'", function (assert) {
-  var inputString = "M";
-  var expectedLength = 3;
+  let inputString = "M";
+  let expectedLength = 3;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Ma'", function (assert) {
-  var inputString = "Ma";
-  var expectedLength = 2;
+  let inputString = "Ma";
+  let expectedLength = 2;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Mar'", function (assert) {
-  var inputString = "Mar";
-  var expectedLength = 2;
+  let inputString = "Mar";
+  let expectedLength = 2;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Mars'", function (assert) {
-  var inputString = "Mars";
-  var expectedLength = 1;
+  let inputString = "Mars";
+  let expectedLength = 1;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 function testMarsBasics(assert, inputString, expectedLength) {
-  var inFn = jQueryFrameFn("#page\\:mainForm\\:input\\:\\:field");
-  var suggestionsFn = getSuggestions("#page\\:mainForm\\:input");
+  let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:input\\:\\:field");
+  let suggestionsFn = getSuggestions("#page\\:mainForm\\:input");
 
-  var TTT = new TobagoTestTool(assert);
+  let TTT = new TobagoTestTool(assert);
   TTT.action(function () {
-    inFn().val(inputString).trigger('input');
+    inFn().value = inputString;
+    inFn().dispatchEvent(new Event('input'));
   });
   TTT.waitForResponse();
   TTT.asserts(expectedLength + 1, function () {
     assert.equal(suggestionsFn().length, expectedLength);
     for (let i = 0; i < expectedLength; i++) {
-      assert.ok(suggestionsFn().eq(i).find("strong").text().toUpperCase().indexOf(inputString.toUpperCase()) >= 0);
+      assert.ok(suggestionsFn().item(i).querySelector("strong").textContent.toUpperCase().indexOf(inputString.toUpperCase()) >= 0);
     }
   });
   TTT.startTest();
@@ -69,6 +70,6 @@ function escapeClientId(clientId) {
 }
 
 function getSuggestions(id) {
-  return jQueryFrameFn(escapeClientId(
-      jQueryFrame(id + " tobago-suggest").attr("id") + "::popup") + " .tt-suggestion");
+  return testFrameQuerySelectorAllFn(escapeClientId(
+      testFrameQuerySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
 }
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/Date_Pattern.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/Date_Pattern.test.js
index f416979..c522847 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/Date_Pattern.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/Date_Pattern.test.js
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import {jQueryFrameFn} from "/script/tobago-test.js";
 import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
 
 QUnit.test("test patterns", function (assert) {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2500-tab/Tabgroup_Style.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2500-tab/Tabgroup_Style.test.js
index c9d0687..bafbe61 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2500-tab/Tabgroup_Style.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2500-tab/Tabgroup_Style.test.js
@@ -15,38 +15,38 @@
  * limitations under the License.
  */
 
-import {jQueryFrame} from "/script/tobago-test.js";
+import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
 
 QUnit.test("test numbers of tab-group-index", function (assert) {
-  var $tabOne = jQueryFrame("#page\\:mainForm\\:tabOne");
-  var $tabTwo = jQueryFrame("#page\\:mainForm\\:tabTwo");
-  var $tabThree = jQueryFrame("#page\\:mainForm\\:tabThree");
-  var $tabFour = jQueryFrame("#page\\:mainForm\\:tabFour");
-  var $tabFive = jQueryFrame("#page\\:mainForm\\:tabFive");
-  var $tabOneContent = jQueryFrame("#page\\:mainForm\\:tabOne\\:\\:content");
-  var $tabTwoContent = jQueryFrame("#page\\:mainForm\\:tabTwo\\:\\:content");
-  var $tabThreeContent = jQueryFrame("#page\\:mainForm\\:tabThree\\:\\:content");
-  var $tabFourContent = jQueryFrame("#page\\:mainForm\\:tabFour\\:\\:content");
-  var $tabFiveContent = jQueryFrame("#page\\:mainForm\\:tabFive\\:\\:content");
+  let tabOneFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabOne");
+  let tabTwoFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabTwo");
+  let tabThreeFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabThree");
+  let tabFourFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabFour");
+  let tabFiveFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabFive");
+  let tabOneContentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabOne\\:\\:content");
+  let tabTwoContentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabTwo\\:\\:content");
+  let tabThreeContentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabThree\\:\\:content");
+  let tabFourContentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabFour\\:\\:content");
+  let tabFiveContentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabFive\\:\\:content");
 
-  assert.equal($tabOne.data("tobago-tab-group-index"), "0");
-  assert.equal($tabTwo.data("tobago-tab-group-index"), "1");
-  assert.equal($tabThree.length, 0, "Tab three is not rendered");
-  assert.equal($tabFour.data("tobago-tab-group-index"), "3");
-  assert.equal($tabFive.data("tobago-tab-group-index"), "4");
+  assert.equal(tabOneFn().dataset.tobagoTabGroupIndex, "0");
+  assert.equal(tabTwoFn().dataset.tobagoTabGroupIndex, "1");
+  assert.equal(tabThreeFn(), null, "Tab three is not rendered");
+  assert.equal(tabFourFn().dataset.tobagoTabGroupIndex, "3");
+  assert.equal(tabFiveFn().dataset.tobagoTabGroupIndex, "4");
 
-  assert.equal($tabOneContent.data("tobago-tab-group-index"), "0");
-  assert.equal($tabTwoContent.data("tobago-tab-group-index"), "1");
-  assert.equal($tabThreeContent.length, 0, "Tab three content is not rendered");
-  assert.equal($tabFiveContent.data("tobago-tab-group-index"), "4");
+  assert.equal(tabOneContentFn().dataset.tobagoTabGroupIndex, "0");
+  assert.equal(tabTwoContentFn().dataset.tobagoTabGroupIndex, "1");
+  assert.equal(tabThreeContentFn(), null, "Tab three content is not rendered");
+  assert.equal(tabFiveContentFn().dataset.tobagoTabGroupIndex, "4");
 
-  assert.ok($tabOne.hasClass("tobago-tab-markup-selected"));
-  assert.notOk($tabTwo.hasClass("tobago-tab-markup-selected"));
-  assert.notOk($tabFour.hasClass("tobago-tab-markup-selected"));
-  assert.notOk($tabFive.hasClass("tobago-tab-markup-selected"));
+  assert.ok(tabOneFn().classList.contains("tobago-tab-markup-selected"));
+  assert.notOk(tabTwoFn().classList.contains("tobago-tab-markup-selected"));
+  assert.notOk(tabFourFn().classList.contains("tobago-tab-markup-selected"));
+  assert.notOk(tabFiveFn().classList.contains("tobago-tab-markup-selected"));
 
-  assert.ok($tabOneContent.hasClass("active"));
-  assert.notOk($tabTwoContent.hasClass("active"));
-  assert.notOk($tabFourContent.hasClass("active"));
-  assert.notOk($tabFiveContent.hasClass("active"));
+  assert.ok(tabOneContentFn().classList.contains("active"));
+  assert.notOk(tabTwoContentFn().classList.contains("active"));
+  assert.equal(tabFourContentFn(), null);
+  assert.notOk(tabFiveContentFn().classList.contains("active"));
 });


Mime
View raw message