Return the currently installed {@link TimeoutHandler}, if + * any.
+ */ + + public TimeoutHandler getTimeoutHandler() { + return timeoutHandler; + } + + /** + *Install an instance of {@link TimeoutHandler} that will be
+ * used for all subsequent browser interactions (clicks, loads, Ajax
+ * transactions, etc). To remove the TimeoutHandler,
+ * pass null to this method. If a handler is
+ * installed, the timer is automatically started when a browser
+ * interaction commences. If the browser interaction does not
+ * complete within {@link #getTimeout} milliseconds, the {@link
+ * TimeoutHandler#timeout} method is called on the argument
+ * TimeoutHandler instance.
Return the number of milliseconds that must elapse before the
+ * {@link TimeoutHandler} is called. Note that a
+ * TimeoutHandler is only called if the user has
+ * installed one by calling {@link #setTimeoutHandler}.
Set the number of milliseconds that must elapse before the + * {@link TimeoutHandler} is called, if such an instance has been + * installed via a previous call to {@link @setTimeoutHandler}.
+ */ + + public void setTimeout(long Timeout) { + this.Timeout = Timeout; + } + + private long waitInterval = 5000L; + + /** + *Return the number of milliseconds to wait between timeout + * checks.
+ */ + + public long getTimeoutWaitInterval() { + return waitInterval; + } + + /** + *Set the number of milliseconds to wait between timeout + * checks.
+ */ + + public void setTimeoutWaitInterval(long waitInterval) { + this.waitInterval = waitInterval; + } + + + + private class TimeoutRunnable implements Runnable { + + public void run() { + setRunning(true); + + while (isRunning()) { + try { + Thread.currentThread().sleep(MCP.this.getTimeoutWaitInterval()); + } catch (InterruptedException ex) { + if (LOGGER.isLoggable(Level.WARNING)) { + LOGGER.log(Level.WARNING, "Thread " + + Thread.currentThread().getName() + + " interrupted while sleeping.", ex); + } + setRunning(false); + return; + } + if (isTimedout()) { + setRunning(false); + if (null != MCP.this.getTimeoutHandler()) { + MCP.this.getTimeoutHandler().timeout(); + } + } + } + + } + + private long startTime = -1L; + + private boolean running = false; + + public boolean isRunning() { + return running; + } + + public void setRunning(boolean newValue) { + if (newValue) { + startTime = System.currentTimeMillis(); + } + else { + startTime = -1L; + } + + this.running = newValue; + } + + /** + *Returns true if {@link isTiming} returns true
+ * and the elapsed time between when timing commenced and
+ * the current time is greater than the value returned by {@link getTimeout}.
+ * Otherwise, returns false. This method need not be called
+ * by the user.
+ */
+
+ public boolean isTimedout() {
+ boolean result = false;
+ if (isRunning()) {
+ result = (MCP.this.getTimeout() < (System.currentTimeMillis() - startTime));
+ }
+ return result;
+ }
+
+ }
+
}
diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/util/THTTPD.java b/mozilla/java/webclient/classes_spec/org/mozilla/mcp/THTTPD.java
old mode 100644
new mode 100755
similarity index 98%
rename from mozilla/java/webclient/test/automated/src/classes/org/mozilla/util/THTTPD.java
rename to mozilla/java/webclient/classes_spec/org/mozilla/mcp/THTTPD.java
index b34b309071b..3104ccfe08f
--- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/util/THTTPD.java
+++ b/mozilla/java/webclient/classes_spec/org/mozilla/mcp/THTTPD.java
@@ -1,5 +1,5 @@
/*
- * $Id: THTTPD.java,v 1.6 2005-03-13 17:56:16 edburns%acm.org Exp $
+ * $Id: THTTPD.java,v 1.1 2007-05-04 17:10:17 edburns%acm.org Exp $
*/
/*
@@ -24,7 +24,7 @@
* Contributor(s): Ed Burns <edburns@acm.org>
*/
-package org.mozilla.util;
+package org.mozilla.mcp;
import java.io.File;
import java.net.ServerSocket;
diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/mcp/TimeoutHandler.java b/mozilla/java/webclient/classes_spec/org/mozilla/mcp/TimeoutHandler.java
new file mode 100755
index 00000000000..0c3aa4f808c
--- /dev/null
+++ b/mozilla/java/webclient/classes_spec/org/mozilla/mcp/TimeoutHandler.java
@@ -0,0 +1,125 @@
+/*
+ * $Id: TimeoutHandler.java,v 1.1 2007-05-04 17:10:17 edburns%acm.org Exp $
+ */
+
+/*
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Sun
+ * Microsystems, Inc. Portions created by Sun are
+ * Copyright (C) 1999 Sun Microsystems, Inc. All
+ * Rights Reserved.
+ *
+ * Contributor(s): Ed Burns <edburns@acm.org>
+ */
+
+package org.mozilla.mcp;
+
+/**
+ *
This class provides a simple facility for placing a time bound on + * browser interactions (clicks, Ajax transactions, etc).
+ * + *Usage
+ * + *A useful pattern is to use this as an inner class within a JUnit + * testscase:
+
+ final Thread testThread = Thread.currentThread();
+ timeoutHandler = new TimeoutHandler() {
+ public void timeout() {
+ super.timeout();
+ testThread.interrupt();
+ fail("Action timed out");
+ }
+ };
+ mcp.setTimeoutHandler(timeoutHandler);
+TimeoutHandler has a boolean JavaBeans property
+ * called didTimeout that can be used after blocking
+ * operations to test if a timeout happened.
+ if (timeoutHandler.isDidTimeout()) {
+ fail("timed out waiting for load");
+ }
+Another useful pattern is to combine the previous inner class + * approach with having the browser perform a non-blocking operation, + * and then causing the main thread to enter a loop until either a + * condition is met, or the timeout occurs:
+ * +
+ bitSet.clear();
+ mcp.clickElement(inplaceFields.get(1));
+ makeAjaxAssertions(bitSet);
+//...
+ private void makeAjaxAssertions(BitSet bitSet) throws Exception {
+ // Artifically wait for the ajax transaction to complete, or the timeout to be reached.
+ int i = 0;
+ while (true) {
+ if (bitSet.get(TestFeature.STOP_WAITING.ordinal())) {
+ break;
+ }
+ i++;
+ Thread.currentThread().sleep(mcp.getTimeoutWaitInterval());
+ }
+
+ // assert that the ajax transaction succeeded
+ assertTrue(bitSet.get(TestFeature.RECEIVED_END_AJAX_EVENT.ordinal()));
+ }
+
+The above code will either exit normally, by virtuo of the + * AjaxListener being called and it setting the STOP_WAITING bit in the + * bitset, or it will terminate due to timeout, in which case the inner + * class timeout method will be called.
+ * + * @author edburns + */ +public class TimeoutHandler { + + /** + *The default implementation sets the value of the
+ * didTimeout JavaBeans property to
+ * true.
Getter for boolean JavaBeans property
+ * didTimeout.
Setter for boolean JavaBeans property
+ * didTimeout.
WebclientTestCase extends junit.framework.TestCase
+ * and allows using MCP from a JUnit test. It makes assertions that
+ * verify preconditions for running MCP.
+ *
This class currently has a number of undocumented and unsupported + * features that can be useful if you take the time to look at the + * source. Specifically, it has the ability to capture output from + * running the testcase, compare that output with a golden file, and it + * has a trivial HTTP server built in so webclient automated tests can + * run without any extra server baggage.
* - * @version $Id: WebclientTestCase.java,v 1.15 2007-03-03 20:35:14 edburns%acm.org Exp $ + * @version $Id: WebclientTestCase.java,v 1.1 2007-05-04 17:10:17 edburns%acm.org Exp $ * - * @see Blah - * @see Bloo * */ @@ -63,8 +70,8 @@ public abstract class WebclientTestCase extends TestCase public static final String WEBCLIENTSTUB_LOG_MODULE = "webclientstub"; public static final String WEBCLIENT_LOG_MODULE = "webclient"; public static String OUTPUT_FILE_ROOT = null; -public static final String TEST_LOG = "org.mozilla.webclient.test"; -public static final String TEST_LOG_STRINGS = "org.mozilla.webclient.TestLogStrings"; +public static final String TEST_LOG = "org.mozilla.mcp.junit"; +public static final String TEST_LOG_STRINGS = "org.mozilla.mcp.junit.TestLogStrings"; public static final Logger LOGGER = getLogger(TEST_LOG); diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/mcp/junit/package.html b/mozilla/java/webclient/classes_spec/org/mozilla/mcp/junit/package.html new file mode 100755 index 00000000000..7cff3fa6671 --- /dev/null +++ b/mozilla/java/webclient/classes_spec/org/mozilla/mcp/junit/package.html @@ -0,0 +1,43 @@ + + + + + + + +JUnit Support for Mozilla Control Program
+ +
+
+This class extends JUnit TestCase for use with MCP.
+ + + diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/BookmarksTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/BookmarksTest.java index 781b0d02420..384bcf3298a 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/BookmarksTest.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/BookmarksTest.java @@ -1,5 +1,5 @@ /* - * $Id: BookmarksTest.java,v 1.1 2003-09-28 06:29:18 edburns%acm.org Exp $ + * $Id: BookmarksTest.java,v 1.2 2007-05-04 17:10:18 edburns%acm.org Exp $ */ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- @@ -32,6 +32,7 @@ import junit.framework.Test; import java.util.Enumeration; import javax.swing.tree.TreeModel; import javax.swing.tree.TreeNode; +import org.mozilla.mcp.junit.WebclientTestCase; // BookmarksTest.java diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/BrowserControlFactoryTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/BrowserControlFactoryTest.java index 1fc3889aed7..9d513abf8a3 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/BrowserControlFactoryTest.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/BrowserControlFactoryTest.java @@ -1,5 +1,5 @@ /* - * $Id: BrowserControlFactoryTest.java,v 1.4 2006-03-05 03:53:26 edburns%acm.org Exp $ + * $Id: BrowserControlFactoryTest.java,v 1.5 2007-05-04 17:10:18 edburns%acm.org Exp $ */ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- @@ -28,6 +28,7 @@ package org.mozilla.webclient; import junit.framework.TestSuite; import junit.framework.Test; +import org.mozilla.mcp.junit.WebclientTestCase; // BrowserControlFactoryTest.java diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/CurrentPageTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/CurrentPageTest.java index 923f5b1077f..e1288d556b8 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/CurrentPageTest.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/CurrentPageTest.java @@ -1,5 +1,5 @@ /* - * $Id: CurrentPageTest.java,v 1.16 2007-02-26 21:32:35 edburns%acm.org Exp $ + * $Id: CurrentPageTest.java,v 1.17 2007-05-04 17:10:35 edburns%acm.org Exp $ */ /* @@ -43,6 +43,7 @@ import java.awt.datatransfer.DataFlavor; import java.io.File; import java.io.FileInputStream; import java.io.BufferedReader; +import org.mozilla.mcp.junit.WebclientTestCase; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/DOMTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/DOMTest.java index facf4ba3fea..535357c781d 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/DOMTest.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/DOMTest.java @@ -1,5 +1,5 @@ /* - * $Id: DOMTest.java,v 1.3 2007-03-06 03:28:47 edburns%acm.org Exp $ + * $Id: DOMTest.java,v 1.4 2007-05-04 17:10:35 edburns%acm.org Exp $ */ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- @@ -37,6 +37,7 @@ import java.awt.Robot; import java.io.File; import java.io.FileInputStream; +import org.mozilla.mcp.junit.WebclientTestCase; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/DocumentLoadListenerTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/DocumentLoadListenerTest.java index c0dc752a506..ae465881fac 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/DocumentLoadListenerTest.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/DocumentLoadListenerTest.java @@ -1,5 +1,5 @@ /* - * $Id: DocumentLoadListenerTest.java,v 1.5 2006-03-17 00:26:02 edburns%acm.org Exp $ + * $Id: DocumentLoadListenerTest.java,v 1.6 2007-05-04 17:10:35 edburns%acm.org Exp $ */ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- @@ -42,6 +42,7 @@ import java.io.InputStream; import java.awt.Robot; import java.awt.event.InputEvent; +import org.mozilla.mcp.junit.WebclientTestCase; // DocumentLoadListenerTest.java diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/HistoryTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/HistoryTest.java index 2bc8049130f..937258d5e89 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/HistoryTest.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/HistoryTest.java @@ -1,5 +1,5 @@ /* - * $Id: HistoryTest.java,v 1.3 2004-10-26 19:33:15 edburns%acm.org Exp $ + * $Id: HistoryTest.java,v 1.4 2007-05-04 17:10:35 edburns%acm.org Exp $ */ /* @@ -37,6 +37,7 @@ import java.awt.BorderLayout; import java.io.File; import java.io.FileInputStream; +import org.mozilla.mcp.junit.WebclientTestCase; // HistoryTest.java diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/KeyListenerTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/KeyListenerTest.java index 6d0e70f4ba8..f7d599c69c5 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/KeyListenerTest.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/KeyListenerTest.java @@ -1,5 +1,5 @@ /* - * $Id: KeyListenerTest.java,v 1.4 2007-02-15 04:59:50 edburns%acm.org Exp $ + * $Id: KeyListenerTest.java,v 1.5 2007-05-04 17:10:35 edburns%acm.org Exp $ */ /* @@ -36,6 +36,7 @@ import java.awt.event.KeyListener; import java.awt.event.KeyEvent; import java.awt.event.InputEvent; import java.awt.BorderLayout; +import org.mozilla.mcp.junit.WebclientTestCase; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/MouseListenerTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/MouseListenerTest.java index 3937a07fecb..5dccdb36335 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/MouseListenerTest.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/MouseListenerTest.java @@ -1,5 +1,5 @@ /* - * $Id: MouseListenerTest.java,v 1.3 2005-08-20 19:25:52 edburns%acm.org Exp $ + * $Id: MouseListenerTest.java,v 1.4 2007-05-04 17:10:35 edburns%acm.org Exp $ */ /* @@ -37,6 +37,7 @@ import java.awt.event.MouseListener; import java.awt.event.MouseEvent; import java.awt.event.InputEvent; import java.awt.BorderLayout; +import org.mozilla.mcp.junit.WebclientTestCase; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/NavigationTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/NavigationTest.java index 8b290316581..68f5617b81a 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/NavigationTest.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/NavigationTest.java @@ -1,5 +1,5 @@ /* - * $Id: NavigationTest.java,v 1.21 2007-02-23 19:03:12 edburns%acm.org Exp $ + * $Id: NavigationTest.java,v 1.22 2007-05-04 17:10:35 edburns%acm.org Exp $ */ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- @@ -36,6 +36,7 @@ import java.awt.BorderLayout; import java.io.File; import java.io.FileInputStream; +import org.mozilla.mcp.junit.WebclientTestCase; // NavigationTest.java diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/PreferencesTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/PreferencesTest.java index 538d72c6008..bab3bf335cf 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/PreferencesTest.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/PreferencesTest.java @@ -1,5 +1,5 @@ /* - * $Id: PreferencesTest.java,v 1.2 2004-04-01 14:54:57 edburns%acm.org Exp $ + * $Id: PreferencesTest.java,v 1.3 2007-05-04 17:10:35 edburns%acm.org Exp $ */ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- @@ -31,6 +31,7 @@ import junit.framework.Test; import java.util.Properties; import java.util.Iterator; +import org.mozilla.mcp.junit.WebclientTestCase; // PreferencesTest.java diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/ProfileManagerTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/ProfileManagerTest.java index 342ceb5616c..17f2bfd047d 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/ProfileManagerTest.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/ProfileManagerTest.java @@ -1,5 +1,5 @@ /* - * $Id: ProfileManagerTest.java,v 1.3 2004-11-05 06:40:27 edburns%acm.org Exp $ + * $Id: ProfileManagerTest.java,v 1.4 2007-05-04 17:10:35 edburns%acm.org Exp $ */ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- @@ -28,6 +28,7 @@ package org.mozilla.webclient; import junit.framework.TestSuite; import junit.framework.Test; +import org.mozilla.mcp.junit.WebclientTestCase; // ProfileManagerTest.java diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WindowCreatorTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WindowCreatorTest.java index e0777b38fd3..2e48eb8b442 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WindowCreatorTest.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WindowCreatorTest.java @@ -1,5 +1,5 @@ /* - * $Id: WindowCreatorTest.java,v 1.4 2007-01-22 12:35:14 edburns%acm.org Exp $ + * $Id: WindowCreatorTest.java,v 1.5 2007-05-04 17:10:35 edburns%acm.org Exp $ */ /* @@ -43,6 +43,7 @@ import java.awt.BorderLayout; import java.io.File; import java.io.FileInputStream; +import org.mozilla.mcp.junit.WebclientTestCase; // WindowCreatorTest.java diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/WebclientFactoryImplTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/WebclientFactoryImplTest.java index 5cb613494ac..1e0f08a71f0 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/WebclientFactoryImplTest.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/WebclientFactoryImplTest.java @@ -1,5 +1,5 @@ /* - * $Id: WebclientFactoryImplTest.java,v 1.1 2003-09-28 06:29:19 edburns%acm.org Exp $ + * $Id: WebclientFactoryImplTest.java,v 1.2 2007-05-04 17:10:35 edburns%acm.org Exp $ */ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- @@ -29,7 +29,7 @@ package org.mozilla.webclient.impl; import junit.framework.TestSuite; import junit.framework.Test; -import org.mozilla.webclient.WebclientTestCase; +import org.mozilla.mcp.junit.WebclientTestCase; // WebclientFactoryImplTest.java diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/TestGtkBrowserControlCanvas.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/TestGtkBrowserControlCanvas.java index 1d1fb16dc8d..20b15455bca 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/TestGtkBrowserControlCanvas.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/TestGtkBrowserControlCanvas.java @@ -1,5 +1,5 @@ /* - * $Id: TestGtkBrowserControlCanvas.java,v 1.1 2004-04-23 14:52:21 edburns%acm.org Exp $ + * $Id: TestGtkBrowserControlCanvas.java,v 1.2 2007-05-04 17:10:35 edburns%acm.org Exp $ */ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- @@ -31,7 +31,7 @@ package org.mozilla.webclient.impl.wrapper_native; import org.mozilla.util.Assert; import org.mozilla.util.ParameterCheck; -import org.mozilla.webclient.WebclientTestCase; +import org.mozilla.mcp.junit.WebclientTestCase; /** * @@ -39,7 +39,7 @@ import org.mozilla.webclient.WebclientTestCase; * * Lifetime And Scope* - * @version $Id: TestGtkBrowserControlCanvas.java,v 1.1 2004-04-23 14:52:21 edburns%acm.org Exp $ + * @version $Id: TestGtkBrowserControlCanvas.java,v 1.2 2007-05-04 17:10:35 edburns%acm.org Exp $ * * @see Blah * @see Bloo diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImplTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImplTest.java index c1f4265db9a..5d2af728a99 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImplTest.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImplTest.java @@ -1,5 +1,5 @@ /* - * $Id: WrapperFactoryImplTest.java,v 1.4 2004-04-20 16:17:43 edburns%acm.org Exp $ + * $Id: WrapperFactoryImplTest.java,v 1.5 2007-05-04 17:10:35 edburns%acm.org Exp $ */ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- @@ -31,7 +31,7 @@ import junit.framework.Test; import org.mozilla.webclient.BrowserControl; import org.mozilla.webclient.BrowserControlFactory; -import org.mozilla.webclient.WebclientTestCase; +import org.mozilla.mcp.junit.WebclientTestCase; import org.mozilla.webclient.impl.BrowserControlImpl; // WrapperFactoryImplTest.java