You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2017/04/09 13:18:54 UTC

svn commit: r1790743 - in /myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content: 20-component/010-input/50-input-group/ 20-component/030-select/30-selectOneRadio/ 30-concept/08-form/ 40-test/3000-sheet/10-sheet-types/ 40-test...

Author: hnoeth
Date: Sun Apr  9 13:18:54 2017
New Revision: 1790743

URL: http://svn.apache.org/viewvc?rev=1790743&view=rev
Log:
fix tests
* fix qunit-integration-tests

Modified:
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.test.js
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/selectOneRadio.test.js
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.test.js
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/10-sheet-types/sheet-types.test.js
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.test.js?rev=1790743&r1=1790742&r2=1790743&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.test.js Sun Apr  9 13:18:54 2017
@@ -97,7 +97,7 @@ QUnit.test("inputfield - dropdownbox", f
   var $mainForm = jQueryFrame("#page\\:mainForm");
   var $inputfield = jQueryFrame("#page\\:mainForm\\:value");
   var $input = $inputfield.find("input");
-  var $dropdown = $inputfield.find(".input-group-addon");
+  var $dropdown = $inputfield.find(".input-group-btn");
   var combinedWidth = $input.outerWidth(true) + $dropdown.outerWidth(true);
 
   assert.equal($inputfield.outerWidth(true), $mainForm.width());

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/selectOneRadio.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/selectOneRadio.test.js?rev=1790743&r1=1790742&r2=1790743&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/selectOneRadio.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/selectOneRadio.test.js Sun Apr  9 13:18:54 2017
@@ -32,7 +32,7 @@ QUnit.test("submit: Addition (2 + 4)", f
   $submitAdd.click();
 
   jQuery("#page\\:testframe").load(function () {
-    if (step == 1) {
+    if (step === 1) {
       var $output = jQueryFrame("#page\\:mainForm\\:resultOutput span");
       assert.equal($output.text(), "6");
 
@@ -59,7 +59,7 @@ QUnit.test("submit: Subtraction (4 - 1)"
   $submitSub.click();
 
   jQuery("#page\\:testframe").load(function () {
-    if (step == 1) {
+    if (step === 1) {
       var $output = jQueryFrame("#page\\:mainForm\\:resultOutput span");
       assert.equal($output.text(), "3");
 
@@ -73,7 +73,7 @@ QUnit.test("ajax: select Mars", function
   assert.expect(2);
   var done = assert.async();
   var $planet = jQueryFrame("#page\\:mainForm\\:selectPlanet input");
-  var $moons = jQueryFrame("#page\\:mainForm\\:moonradio li label");
+  var $moons = jQueryFrame("#page\\:mainForm\\:moonradio label.form-check-label");
 
   $planet.eq(0).prop("checked", false);
   $planet.eq(2).prop("checked", false);
@@ -81,8 +81,8 @@ QUnit.test("ajax: select Mars", function
 
   waitForAjax(function () {
     $moons = jQueryFrame($moons.selector);
-    return $moons.eq(0).text() == "Phobos"
-        && $moons.eq(1).text() == "Deimos";
+    return $moons.eq(0).text() === "Phobos"
+        && $moons.eq(1).text() === "Deimos";
   }, function () {
     $moons = jQueryFrame($moons.selector);
     assert.equal($moons.eq(0).text(), "Phobos");
@@ -95,7 +95,7 @@ QUnit.test("ajax: select Jupiter", funct
   assert.expect(4);
   var done = assert.async();
   var $planet = jQueryFrame("#page\\:mainForm\\:selectPlanet input");
-  var $moons = jQueryFrame("#page\\:mainForm\\:moonradio li label");
+  var $moons = jQueryFrame("#page\\:mainForm\\:moonradio label.form-check-label");
 
   $planet.eq(0).prop("checked", false);
   $planet.eq(1).prop("checked", false);
@@ -103,10 +103,10 @@ QUnit.test("ajax: select Jupiter", funct
 
   waitForAjax(function () {
     $moons = jQueryFrame($moons.selector);
-    return $moons.eq(0).text() == "Europa"
-        && $moons.eq(1).text() == "Ganymed"
-        && $moons.eq(2).text() == "Io"
-        && $moons.eq(3).text() == "Kallisto";
+    return $moons.eq(0).text() === "Europa"
+        && $moons.eq(1).text() === "Ganymed"
+        && $moons.eq(2).text() === "Io"
+        && $moons.eq(3).text() === "Kallisto";
   }, function () {
     $moons = jQueryFrame($moons.selector);
     assert.equal($moons.eq(0).text(), "Europa");

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.test.js?rev=1790743&r1=1790742&r2=1790743&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.test.js Sun Apr  9 13:18:54 2017
@@ -20,11 +20,11 @@ QUnit.test("submit form 1", function (as
   var done = assert.async();
   var step = 1;
 
-  var $form1InputField = jQueryFrame("#page\\:mainForm\\:form1\\:in\\:\\:field");
-  var $form1SubmitButton = jQueryFrame("#page\\:mainForm\\:form1\\:submit");
+  var $form1InputField = jQueryFrame("#page\\:mainForm\\:form1\\:in1\\:\\:field");
+  var $form1SubmitButton = jQueryFrame("#page\\:mainForm\\:form1\\:submit1");
 
-  var $form2InputField = jQueryFrame("#page\\:mainForm\\:form2\\:in\\:\\:field");
-  var $form2OutputFieldValue = jQueryFrame("#page\\:mainForm\\:form2\\:out span").text();
+  var $form2InputField = jQueryFrame("#page\\:mainForm\\:form2\\:in2\\:\\:field");
+  var $form2OutputFieldValue = jQueryFrame("#page\\:mainForm\\:form2\\:out2 span").text();
 
   $form1InputField.val("Oliver");
   $form2InputField.val("Peter");
@@ -32,11 +32,11 @@ QUnit.test("submit form 1", function (as
   $form1SubmitButton.click();
 
   jQuery("#page\\:testframe").load(function () {
-    if (step == 1) {
-      $form1InputField = jQueryFrame("#page\\:mainForm\\:form1\\:in\\:\\:field");
-      var $form1OutputField = jQueryFrame("#page\\:mainForm\\:form1\\:out span");
-      $form2InputField = jQueryFrame("#page\\:mainForm\\:form2\\:in\\:\\:field");
-      var $form2OutputField = jQueryFrame("#page\\:mainForm\\:form2\\:out span");
+    if (step === 1) {
+      $form1InputField = jQueryFrame("#page\\:mainForm\\:form1\\:in1\\:\\:field");
+      var $form1OutputField = jQueryFrame("#page\\:mainForm\\:form1\\:out1 span");
+      $form2InputField = jQueryFrame("#page\\:mainForm\\:form2\\:in2\\:\\:field");
+      var $form2OutputField = jQueryFrame("#page\\:mainForm\\:form2\\:out2 span");
 
       assert.equal($form1InputField.val(), "Oliver");
       assert.equal($form1OutputField.text(), "Oliver");
@@ -54,11 +54,11 @@ QUnit.test("submit form 2", function (as
   var done = assert.async();
   var step = 1;
 
-  var $form1InputField = jQueryFrame("#page\\:mainForm\\:form1\\:in\\:\\:field");
-  var $form1OutputFieldValue = jQueryFrame("#page\\:mainForm\\:form1\\:out span").text();
+  var $form1InputField = jQueryFrame("#page\\:mainForm\\:form1\\:in1\\:\\:field");
+  var $form1OutputFieldValue = jQueryFrame("#page\\:mainForm\\:form1\\:out1 span").text();
 
-  var $form2InputField = jQueryFrame("#page\\:mainForm\\:form2\\:in\\:\\:field");
-  var $form2SubmitButton = jQueryFrame("#page\\:mainForm\\:form2\\:submit");
+  var $form2InputField = jQueryFrame("#page\\:mainForm\\:form2\\:in2\\:\\:field");
+  var $form2SubmitButton = jQueryFrame("#page\\:mainForm\\:form2\\:submit2");
 
   $form1InputField.val("Oliver");
   $form2InputField.val("Peter");
@@ -66,11 +66,11 @@ QUnit.test("submit form 2", function (as
   $form2SubmitButton.click();
 
   jQuery("#page\\:testframe").load(function () {
-    if (step == 1) {
-      $form1InputField = jQueryFrame("#page\\:mainForm\\:form1\\:in\\:\\:field");
-      var $form1OutputField = jQueryFrame("#page\\:mainForm\\:form1\\:out span");
-      $form2InputField = jQueryFrame("#page\\:mainForm\\:form2\\:in\\:\\:field");
-      var $form2OutputField = jQueryFrame("#page\\:mainForm\\:form2\\:out span");
+    if (step === 1) {
+      $form1InputField = jQueryFrame("#page\\:mainForm\\:form1\\:in1\\:\\:field");
+      var $form1OutputField = jQueryFrame("#page\\:mainForm\\:form1\\:out1 span");
+      $form2InputField = jQueryFrame("#page\\:mainForm\\:form2\\:in2\\:\\:field");
+      var $form2OutputField = jQueryFrame("#page\\:mainForm\\:form2\\:out2 span");
 
       assert.equal($form1InputField.val(), "Oliver");
       assert.equal($form1OutputField.text(), $form1OutputFieldValue);

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.xhtml?rev=1790743&r1=1790742&r2=1790743&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.xhtml Sun Apr  9 13:18:54 2017
@@ -46,9 +46,9 @@
 &lt;/tc:box></code></pre>
     <tc:box label="Form 1">
       <tc:form id="form1">
-        <tc:in id="in" label="Value 1" value="#{formController.value1}"/>
-        <tc:out id="out" label="Value 1 in Model" value="#{formController.value1}"/>
-        <tc:button id="submit" label="Submit"/>
+        <tc:in id="in1" label="Value 1" value="#{formController.value1}"/>
+        <tc:out id="out1" label="Value 1 in Model" value="#{formController.value1}"/>
+        <tc:button id="submit1" label="Submit"/>
       </tc:form>
     </tc:box>
     <tc:box label="Form 2">

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/10-sheet-types/sheet-types.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/10-sheet-types/sheet-types.test.js?rev=1790743&r1=1790742&r2=1790743&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/10-sheet-types/sheet-types.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/10-sheet-types/sheet-types.test.js Sun Apr  9 13:18:54 2017
@@ -19,70 +19,70 @@ QUnit.test("Column 0: tc:columnSelector"
   assert.expect(4);
 
   var $column = getColumn(0);
-  testWidthHeight(assert, $column, 50, 57, 13, 13);
+  testWidthHeight(assert, $column, 50, 63, 13, 13);
 });
 
 QUnit.test("Column 1: tc:out", function(assert) {
   assert.expect(4);
 
   var $column = getColumn(1);
-  testWidthHeight(assert, $column, 70, 57, 70, 40);
+  testWidthHeight(assert, $column, 70, 63, 46, 40);
 });
 
 QUnit.test("Column 2: tc:out", function(assert) {
   assert.expect(4);
 
   var $column = getColumn(2);
-  testWidthHeight(assert, $column, 70, 57, 70, 40);
+  testWidthHeight(assert, $column, 70, 63, 46, 40);
 });
 
 QUnit.test("Column 3: tc:in", function(assert) {
   assert.expect(4);
 
   var $column = getColumn(3);
-  testWidthHeight(assert, $column, 90, 57, 90, 38);
+  testWidthHeight(assert, $column, 90, 63, 66, 38);
 });
 
 QUnit.test("Column 4: tc:date", function(assert) {
   assert.expect(4);
 
   var $column = getColumn(4);
-  testWidthHeight(assert, $column, 160, 57, 160, 38);
+  testWidthHeight(assert, $column, 160, 63, 136, 38);
 });
 
 QUnit.test("Column 5: tc:button", function(assert) {
   assert.expect(4);
 
   var $column = getColumn(5);
-  testWidthHeight(assert, $column, 100, 57, 63, 38);
+  testWidthHeight(assert, $column, 100, 63, 63, 38);
 });
 
 QUnit.test("Column 6: tc:link", function(assert) {
   assert.expect(4);
 
   var $column = getColumn(6);
-  testWidthHeight(assert, $column, 70, 57, 29, 20);
+  testWidthHeight(assert, $column, 70, 63, 29, 20);
 });
 
 QUnit.test("Column 7: tc:selectOneChoice", function(assert) {
   assert.expect(4);
 
   var $column = getColumn(7);
-  testWidthHeight(assert, $column, 180, 57, 180, 40);
+  testWidthHeight(assert, $column, 180, 63, 156, 40);
 });
 
 QUnit.test("Column 8: tc:image", function(assert) {
   assert.expect(4);
 
   var $column = getColumn(8);
-  testWidthHeight(assert, $column, 90, 57, 72, 30);
+  testWidthHeight(assert, $column, 90, 63, 72, 30);
 });
 
 QUnit.test("Column 9: tc:flexLayout", function(assert) {
   assert.expect(4);
 
   var $column = getColumn(9);
-  testWidthHeight(assert, $column, 130, 57, 130, 56);
+  testWidthHeight(assert, $column, 130, 63, 112, 38);
 });
 
 function testWidthHeight(assert, $column, width, height, childWidth, childHeight) {

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js?rev=1790743&r1=1790742&r2=1790743&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js Sun Apr  9 13:18:54 2017
@@ -15,21 +15,21 @@
  * limitations under the License.
  */
 
-QUnit.test("tc:button", function(assert) {
+QUnit.test("tc:button", function (assert) {
   var eventNames = ["click", "dblclick", "focus", "blur"];
   var $eventComponent = jQueryFrame("#page\\:mainForm\\:buttonevent");
   var $ajaxComponent = jQueryFrame("#page\\:mainForm\\:buttonajax");
   testEvent(assert, "button", eventNames, $eventComponent, $ajaxComponent, null);
 });
 
-QUnit.test("tc:in", function(assert) {
+QUnit.test("tc:in", function (assert) {
   var eventNames = ["change", "click", "dblclick", "focus", "blur"];
   var $eventComponent = jQueryFrame("#page\\:mainForm\\:inevent\\:\\:field");
   var $ajaxComponent = jQueryFrame("#page\\:mainForm\\:inajax\\:\\:field");
-  var changeValue = function($component) {
+  var changeValue = function ($component) {
     var oldValue = $component.val();
     var newValue = "hello";
-    if (oldValue == "hello") {
+    if (oldValue === "hello") {
       newValue = "hello there!"
     }
     return $component.val(newValue);
@@ -37,23 +37,21 @@ QUnit.test("tc:in", function(assert) {
   testEvent(assert, "in", eventNames, $eventComponent, $ajaxComponent, changeValue);
 });
 
-QUnit.test("tc:row", function(assert) {
+QUnit.test("tc:row", function (assert) {
   var eventNames = ["click", "dblclick"];
   var $eventComponent = jQueryFrame("#page\\:mainForm\\:sheetevent\\:0\\:selectPlanet");
   var $ajaxComponent = jQueryFrame("#page\\:mainForm\\:sheetajax\\:0\\:selectPlanet");
   testEvent(assert, "row", eventNames, $eventComponent, $ajaxComponent, null);
 });
 
-QUnit.test("tc:selectBooleanCheckbox", function(assert) {
+QUnit.test("tc:selectBooleanCheckbox", function (assert) {
   var eventNames = ["change", "click", "dblclick", "focus", "blur"];
   var $eventComponent = jQueryFrame("#page\\:mainForm\\:selectBooleanCheckboxevent\\:\\:field");
   var $ajaxComponent = jQueryFrame("#page\\:mainForm\\:selectBooleanCheckboxajax\\:\\:field");
-  var changeValue = function($component) {
+  var changeValue = function ($component) {
     var currentEvent = jQueryFrame("#page\\:mainForm\\:outEventName span").text();
-    if (currentEvent != "click") {
-      console.log("old -- currentEvent: " + currentEvent + " isChecked: " + $component.prop("checked"));
+    if (currentEvent !== "click") {
       return $component.prop("checked", !$component.prop("checked"));
-      console.log("new -- currentEvent: " + currentEvent + " isChecked: " + $component.prop("checked"));
     } else {
       return $component;
     }
@@ -61,14 +59,14 @@ QUnit.test("tc:selectBooleanCheckbox", f
   testEvent(assert, "selectBooleanCheckbox", eventNames, $eventComponent, $ajaxComponent, changeValue);
 });
 
-QUnit.test("tc:textarea", function(assert) {
+QUnit.test("tc:textarea", function (assert) {
   var eventNames = ["change", "click", "dblclick", "focus", "blur"];
   var $eventComponent = jQueryFrame("#page\\:mainForm\\:textareaevent\\:\\:field");
   var $ajaxComponent = jQueryFrame("#page\\:mainForm\\:textareaajax\\:\\:field");
-  var changeValue = function($component) {
+  var changeValue = function ($component) {
     var oldValue = $component.val();
     var newValue = "hello";
-    if (oldValue == "hello") {
+    if (oldValue === "hello") {
       newValue = "hello there!"
     }
     return $component.val(newValue);
@@ -90,8 +88,8 @@ function testEvent(assert, componentName
   var eventName = eventNames[0];
   activateComponent(componentName, eventName);
 
-  jQuery("#page\\:testframe").load(function() {
-    if (step % 3 == 0) {
+  jQuery("#page\\:testframe").on("load", function () {
+    if (step === 0) {
       oldActionCount = getActionCount();
       oldActionListenerCount = getActionListenerCount();
       oldAjaxListenerCount = getAjaxListenerCount();
@@ -99,11 +97,13 @@ function testEvent(assert, componentName
       oldTimestamp = getTimestamp();
 
       $eventComponent = jQueryFrame($eventComponent.selector);
-      if (changeValue != null) {
+      if (changeValue !== null) {
         $eventComponent = changeValue($eventComponent);
       }
       $eventComponent.trigger(eventName);
-    } else if (step % 3 == 1) {
+      step++;
+      done();
+    } else if (step === 1) {
       var newActionCount = getActionCount();
       var newActionListenerCount = getActionListenerCount();
       var newAjaxListenerCount = getAjaxListenerCount();
@@ -113,7 +113,7 @@ function testEvent(assert, componentName
       assert.equal(newActionCount, oldActionCount + 1, eventName + " - tc:event - action");
       assert.equal(newActionListenerCount, oldActionListenerCount + 1, eventName + " - tc:event - actionListener");
       assert.equal(newAjaxListenerCount, oldAjaxListenerCount, eventName + " - tc:event - ajaxListener");
-      if (changeValue != null) {
+      if (changeValue !== null) {
         assert.equal(newValueChangeListenerCount, oldValueChangeListenerCount + 1,
             eventName + " - tc:event - valueChangeListener");
       } else {
@@ -130,22 +130,22 @@ function testEvent(assert, componentName
       oldTimestamp = getTimestamp();
 
       $ajaxComponent = jQueryFrame($ajaxComponent.selector);
-      if (changeValue != null) {
+      if (changeValue !== null) {
         $ajaxComponent = changeValue($ajaxComponent);
       }
       $ajaxComponent.trigger(eventName);
 
-      waitForAjax(function() {
+      waitForAjax(function () {
         newActionCount = getActionCount();
         newActionListenerCount = getActionListenerCount();
         newAjaxListenerCount = getAjaxListenerCount();
         newValueChangeListenerCount = getValueChangeListenerCount();
         newTimestamp = getTimestamp();
 
-        return step % 3 == 2
-            && newAjaxListenerCount == oldAjaxListenerCount + 1
+        return step === 2
+            && newAjaxListenerCount === oldAjaxListenerCount + 1
             && newTimestamp > oldTimestamp;
-      }, function() {
+      }, function () {
         newActionCount = getActionCount();
         newActionListenerCount = getActionListenerCount();
         newAjaxListenerCount = getAjaxListenerCount();
@@ -155,7 +155,7 @@ function testEvent(assert, componentName
         assert.equal(newActionCount, oldActionCount, eventName + " - f:ajax - action");
         assert.equal(newActionListenerCount, oldActionListenerCount, eventName + " - f:ajax - actionListener");
         assert.equal(newAjaxListenerCount, oldAjaxListenerCount + 1, eventName + " - f:ajax - ajaxListener");
-        if (changeValue != null) {
+        if (changeValue !== null) {
           assert.equal(newValueChangeListenerCount, oldValueChangeListenerCount + 1,
               eventName + " - f:ajax - valueChangeListener");
         } else {
@@ -168,21 +168,26 @@ function testEvent(assert, componentName
         done();
 
         // activate next event
-        eventName = eventNames[step / 3];
-        activateComponent(componentName, eventName);
+        eventName = eventNames[eventNames.indexOf(eventName) + 1];
+        if (eventName !== undefined) {
+          activateComponent(componentName, eventName);
+          step = 0;
+        } else {
+          jQuery("#page\\:testframe").off("load");
+        }
       });
+      step++;
+      done();
     }
-    step++;
-    done();
   });
 }
 
 function activateComponent(componentName, eventName) {
-  jQueryFrame("#page\\:mainForm\\:componentTable .tobago-sheet-row").each(function() {
-    if (jQuery(this).find("td").eq(0).find("span").text() == componentName) {
-      jQuery(this).find("button").each(function() {
+  jQueryFrame("#page\\:mainForm\\:componentTable .tobago-sheet-row").each(function () {
+    if (jQuery(this).find("td").eq(0).find("span").text() === componentName) {
+      jQuery(this).find("button").each(function () {
         var id = jQuery(this).attr("id");
-        if (id != undefined && id.indexOf(eventName + "Behavior") >= 0) {
+        if (id !== undefined && id.indexOf(eventName + "Behavior") >= 0) {
           this.click();
         }
       });