10:11 a.m.
Author: lfryc(a)redhat.com
Date: 2010-09-14 11:11:57 -0400 (Tue, 14 Sep 2010)
New Revision: 19197
Added:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/waiting/
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/waiting/WaitFactory.java
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueModel.java
Log:
forgotten to commit WaitFactory
Added:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/waiting/WaitFactory.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/waiting/WaitFactory.java
(rev 0)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/waiting/WaitFactory.java 2010-09-14
15:11:57 UTC (rev 19197)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.selenium.waiting;
+
+import static org.jboss.test.selenium.SystemProperties.getSeleniumTimeout;
+import static org.jboss.test.selenium.waiting.Wait.waitAjax;
+import static org.jboss.test.selenium.waiting.Wait.waitSelenium;
+import static org.jboss.test.selenium.AbstractTestCase.WAIT_AJAX_INTERVAL;
+import static org.jboss.test.selenium.AbstractTestCase.WAIT_GUI_INTERVAL;
+import static org.jboss.test.selenium.AbstractTestCase.WAIT_MODEL_INTERVAL;
+import static org.jboss.test.selenium.SystemProperties.SeleniumTimeoutType.AJAX;
+import static org.jboss.test.selenium.SystemProperties.SeleniumTimeoutType.GUI;
+import static org.jboss.test.selenium.SystemProperties.SeleniumTimeoutType.MODEL;
+
+import org.jboss.test.selenium.waiting.ajax.AjaxWaiting;
+import org.jboss.test.selenium.waiting.selenium.SeleniumWaiting;
+
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
+public class WaitFactory {
+ /**
+ * Waits for GUI interaction, such as rendering
+ */
+ public static AjaxWaiting waitGui =
waitAjax().interval(WAIT_GUI_INTERVAL).timeout(getSeleniumTimeout(GUI));
+ /**
+ * Waits for AJAX interaction with server - not computationally difficult
+ */
+ public static AjaxWaiting waitAjax =
waitAjax().interval(WAIT_AJAX_INTERVAL).timeout(getSeleniumTimeout(AJAX));
+ /**
+ * Waits for computationally difficult requests
+ */
+ public static SeleniumWaiting waitModel =
waitSelenium().interval(WAIT_MODEL_INTERVAL).timeout(
+ getSeleniumTimeout(MODEL));
+}
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueModel.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueModel.java 2010-09-14
14:53:40 UTC (rev 19196)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueModel.java 2010-09-14
15:11:57 UTC (rev 19197)
@@ -101,7 +101,6 @@
public void checkCounts(int events1, int events2, int requests, int domUpdates) {
assertChangeIfNotEqualToOldValue(retrieveEvent1Count, events1,
"event1Count");
-
assertChangeIfNotEqualToOldValue(retrieveRequestCount, requests,
"requestCount");
assertChangeIfNotEqualToOldValue(retrieveDOMUpdateCount, domUpdates,
"domUpdates");
if (isEvent2Present()) {