From 416da4356ad4d9bb73346fa1787797c7f135ad95 Mon Sep 17 00:00:00 2001
From: "edburns%acm.org" <edburns%acm.org>
Date: Tue, 26 Oct 2004 19:33:15 +0000
Subject: [PATCH] Move this forward to leverage the THTTPD services of
 WebclientTestCase.

---
 .../org/mozilla/webclient/HistoryTest.java    | 25 ++-----------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/java/webclient/test/automated/src/classes/org/mozilla/webclient/HistoryTest.java b/java/webclient/test/automated/src/classes/org/mozilla/webclient/HistoryTest.java
index b9c2b07567df..5e76c1e8c781 100644
--- a/java/webclient/test/automated/src/classes/org/mozilla/webclient/HistoryTest.java
+++ b/java/webclient/test/automated/src/classes/org/mozilla/webclient/HistoryTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: HistoryTest.java,v 1.2 2004/06/23 19:58:12 edburns%acm.org Exp $
+ * $Id: HistoryTest.java,v 1.3 2004/10/26 19:33:15 edburns%acm.org Exp $
  */
 
 /* 
@@ -26,8 +26,6 @@
 
 package org.mozilla.webclient;
 
-import org.mozilla.util.THTTPD;
-
 import junit.framework.TestSuite;
 import junit.framework.TestResult;
 import junit.framework.Test;
@@ -55,30 +53,11 @@ public class HistoryTest extends WebclientTestCase {
     }
 
     public static Test suite() {
-	TestSuite result = new TestSuite() {
-		public void run(TestResult result) {
-		    serverThread = 
-			new THTTPD.ServerThread("LocalHTTPD",
-						new File (getBrowserBinDir() +
-							  "/../../java/webclient/build.test"), -1);
-		    serverThread.start();
-		    serverThread.P();
-		    super.run(result);
-		    try {
-			BrowserControlFactory.appTerminate();
-		    }
-		    catch (Exception e) {
-			fail();
-		    }
-		    serverThread.stopRunning();
-		}
-	    };
+	TestSuite result = createServerTestSuite();
 	result.addTestSuite(HistoryTest.class);
 	return (result);
     }
 
-    static THTTPD.ServerThread serverThread;
-
     static EventRegistration2 eventRegistration;
 
     static CurrentPage2 currentPage = null;