From 12d6fd624ed5a8327de7072f5d1529c9d703487c Mon Sep 17 00:00:00 2001
From: "edburns%acm.org" <edburns%acm.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 3 Sep 2004 19:04:22 +0000
Subject: [PATCH] This checkin is the start of work for the Http header access
 feature.

Currently, I'm trying to discover what is the best way to expose this
API in documents that include frames.

I think I'll need more than those two new methods on CurrentPage2.  I'll
probably have some way to get a list of all URLs that comprise the
frameset, including nested framesets.  It's true that you could use the
DOM to derive this, but that's very complicated.  I need something more
lightweight.  In the meantime, I'll check in what I have.

M build-tests.xml

- add commented out CurrentPageTest

M build.xml

- add clean.test target

M classes_spec/org/mozilla/webclient/CurrentPage2.java
M classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java

- new methods and no-op impls, so test-first test fails.

+    public Map getRequestHeaders();
+
+    public Map getResponseHeaders();

M classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java

- swallow exceptions thrown by listeners.

M src_moz/EmbedProgress.cpp

- test for existence of httpChannel, so we can visit the headers

M test/automated/src/classes/org/mozilla/util/THTTPD.java

- return a "Server: " header that I can test in the testcase.

M test/automated/src/classes/org/mozilla/webclient/DocumentLoadListenerImpl.java

- add doStartCheck() method.

M test/automated/src/classes/org/mozilla/webclient/NavigationTest.java
M test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java

- push THTTPD stuff to superclass.

A test/automated/src/classes/org/mozilla/webclient/NavigationTest.java

- new testcase, fails.


git-svn-id: svn://10.0.0.236/trunk@161722 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/java/webclient/build-tests.xml        |   1 +
 mozilla/java/webclient/build.xml              |   4 +
 .../org/mozilla/webclient/CurrentPage2.java   |   8 +-
 .../impl/wrapper_native/CurrentPageImpl.java  |  29 ++-
 .../wrapper_native/EventRegistrationImpl.java |   8 +-
 .../java/webclient/src_moz/EmbedProgress.cpp  |  14 ++
 .../src/classes/org/mozilla/util/THTTPD.java  |   5 +-
 .../mozilla/webclient/CurrentPageTest.java    | 198 ++++++++++++++++++
 .../webclient/DocumentLoadListenerImpl.java   |   7 +-
 .../org/mozilla/webclient/NavigationTest.java |  28 +--
 .../mozilla/webclient/WebclientTestCase.java  |  34 ++-
 11 files changed, 287 insertions(+), 49 deletions(-)
 create mode 100644 mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/CurrentPageTest.java

diff --git a/mozilla/java/webclient/build-tests.xml b/mozilla/java/webclient/build-tests.xml
index 70e05e74728..f27e21e6bf4 100644
--- a/mozilla/java/webclient/build-tests.xml
+++ b/mozilla/java/webclient/build-tests.xml
@@ -160,6 +160,7 @@
             <test name="org.mozilla.webclient.impl.wrapper_native.WrapperFactoryImplTest"/>
             <test name="org.mozilla.webclient.impl.WebclientFactoryImplTest"/>
             <test name="org.mozilla.webclient.NavigationTest"/>
+<!--            <test name="org.mozilla.webclient.CurrentPageTest"/> -->
             <test name="org.mozilla.webclient.HistoryTest"/>
 <!-- non running
             <test name="org.mozilla.webclient.wrapper_native.gtk.TestGtkBrowserControlCanvas"/>
diff --git a/mozilla/java/webclient/build.xml b/mozilla/java/webclient/build.xml
index f548392c38f..1ca3b8e6b37 100644
--- a/mozilla/java/webclient/build.xml
+++ b/mozilla/java/webclient/build.xml
@@ -219,6 +219,10 @@ ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.Embedd
     <delete dir="${build.home}/org/mozilla/webclient"/>
   </target>
 
+  <target name="clean.test">
+    <ant antfile="build-tests.xml" target="clean"/>   
+  </target>
+
   <target name="clean" depends="clean.classes_spec">
 
     <ant antfile="build-tests.xml" target="clean"/>   
diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/CurrentPage2.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/CurrentPage2.java
index 576f7b14895..2ce729754ef 100644
--- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/CurrentPage2.java
+++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/CurrentPage2.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Mozilla Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -23,6 +23,8 @@
 
 package org.mozilla.webclient;
 
+import java.util.Map;
+
 
 public interface CurrentPage2 extends CurrentPage
 {
@@ -35,5 +37,9 @@ public interface CurrentPage2 extends CurrentPage
     public void print();
 
     public void printPreview(boolean preview);
+
+    public Map getRequestHeaders();
+
+    public Map getResponseHeaders();
 }
 // end of interface CurrentPage2
diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java
index 1d70fd4d5e0..297599494dd 100644
--- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java
+++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java
@@ -32,6 +32,7 @@ import org.mozilla.webclient.WindowControl;
 import org.mozilla.webclient.impl.WrapperFactory;
 
 import java.util.Properties;
+import java.util.Map;
 import java.io.*;
 import java.net.*;
 
@@ -292,6 +293,17 @@ public void printPreview(boolean preview)
     }
 }
 
+public Map getRequestHeaders()
+{
+    return null;
+}
+
+public Map getResponseHeaders()
+{
+    return null;
+}
+
+
 //
 // Native methods
 //
@@ -328,21 +340,4 @@ native public void nativePrint(int webShellPtr);
 
 native public void nativePrintPreview(int webShellPtr, boolean preview);
 
-// ----VERTIGO_TEST_START
-
-//
-// Test methods
-//
-
-public static void main(String [] args)
-{
-    Assert.setEnabled(true);
-    Log.setApplicationName("CurrentPageImpl");
-    Log.setApplicationVersion("0.0");
-    Log.setApplicationVersionDate("$Id: CurrentPageImpl.java,v 1.5 2004-06-25 13:59:53 edburns%acm.org Exp $");
-
-}
-
-// ----VERTIGO_TEST_END
-
 } // end of class CurrentPageImpl
diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java
index 5ee88a17c14..9c1b89d7416 100644
--- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java
+++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java
@@ -332,7 +332,13 @@ public class BrowserToJavaEventPump extends Thread {
 		    Iterator iter = listeners.iterator();
 		    while (iter.hasNext()) {
 			curListener = (WebclientEventListener) iter.next();
-			curListener.eventDispatched(curEvent);
+			try {
+			    curListener.eventDispatched(curEvent);
+			}
+			catch (Throwable e) {
+			    System.out.println("Caught Execption calling listener: " + curListener + ". Exception: " + e + " " + e.getMessage());
+			    e.printStackTrace();
+			}
 		    }
 		}
 	    }
diff --git a/mozilla/java/webclient/src_moz/EmbedProgress.cpp b/mozilla/java/webclient/src_moz/EmbedProgress.cpp
index 8ab97b73020..516f4033295 100644
--- a/mozilla/java/webclient/src_moz/EmbedProgress.cpp
+++ b/mozilla/java/webclient/src_moz/EmbedProgress.cpp
@@ -23,6 +23,8 @@
 
 #include <nsXPIDLString.h>
 #include <nsIChannel.h>
+#include <nsIHttpChannel.h>
+#include <nsIHttpHeaderVisitor.h>
 
 #include "nsIURI.h"
 #include "nsCRT.h"
@@ -103,10 +105,17 @@ EmbedProgress::OnStateChange(nsIWebProgress *aWebProgress,
     // 
     // document states
     //
+    nsCOMPtr<nsIHttpChannel> channel = do_QueryInterface(aRequest);
 
     // if we've got the start flag, emit the signal
     if ((aStateFlags & STATE_IS_NETWORK) && 
 	(aStateFlags & STATE_START)) {
+	
+	if (channel) {
+	    PR_LOG(prLogModuleInfo, PR_LOG_DEBUG, 
+		   ("EmbedProgress::OnStateChange: have nsIHttpChannel at START_DOCUMENT_LOAD\n"));
+	}
+
 	util_SendEventToJava(nsnull, 
 			     mEventRegistration, 
 			     DOCUMENT_LOAD_LISTENER_CLASSNAME,
@@ -117,6 +126,11 @@ EmbedProgress::OnStateChange(nsIWebProgress *aWebProgress,
     // and for stop, too
     if ((aStateFlags & STATE_IS_NETWORK) && 
 	(aStateFlags & STATE_STOP)) {
+	if (channel) {
+	    PR_LOG(prLogModuleInfo, PR_LOG_DEBUG, 
+		   ("EmbedProgress::OnStateChange: have nsIHttpChannel at END_DOCUMENT_LOAD\n"));
+	}
+
 	util_SendEventToJava(nsnull, 
 			     mEventRegistration, 
 			     DOCUMENT_LOAD_LISTENER_CLASSNAME,
diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/util/THTTPD.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/util/THTTPD.java
index 9b4b715bb56..667b1a9747c 100644
--- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/util/THTTPD.java
+++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/util/THTTPD.java
@@ -1,5 +1,5 @@
 /*
- * $Id: THTTPD.java,v 1.4 2004-06-24 16:23:42 edburns%acm.org Exp $
+ * $Id: THTTPD.java,v 1.5 2004-09-03 19:04:21 edburns%acm.org Exp $
  */
 
 /* 
@@ -156,7 +156,8 @@ public class THTTPD extends Object {
 			    while (null != (curLine = responseReader.readLine())) {
 				responseString.append(curLine);
 			    }
-			    curLine = "Content-type: " + 
+			    curLine = "Server: THTTPD\r\n" + 
+				"Content-type: " + 
 				getContentTypeForFile(responseFile) + 
 				"\r\nContent-Length: " + 
 				responseString.length() + "\r\n\r\n";
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
new file mode 100644
index 00000000000..819a538c2e3
--- /dev/null
+++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/CurrentPageTest.java
@@ -0,0 +1,198 @@
+/*
+ * $Id: CurrentPageTest.java,v 1.1 2004-09-03 19:04:22 edburns%acm.org Exp $
+ */
+
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 
+ * 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 &lt;edburns@acm.org&gt;
+ */
+
+package org.mozilla.webclient;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import java.awt.Frame;
+import java.awt.BorderLayout;
+
+import java.io.File;
+import java.io.FileInputStream;
+
+// CurrentPageTest.java
+
+public class CurrentPageTest extends WebclientTestCase {
+
+    public CurrentPageTest(String name) {
+ 	super(name);
+	try {
+	    BrowserControlFactory.setAppData(getBrowserBinDir());
+	}
+	catch (Exception e) {
+	    fail();
+	}
+    }
+
+    public static Test suite() {
+	TestSuite result = createServerTestSuite();
+	result.addTestSuite(CurrentPageTest.class);
+	return (result);
+    }
+
+    static EventRegistration2 eventRegistration;
+
+    static boolean keepWaiting;
+
+    //
+    // Constants
+    // 
+
+    //
+    // Testcases
+    // 
+
+    public void testHeadersGet() throws Exception {
+	BrowserControl firstBrowserControl = null;
+	DocumentLoadListenerImpl listener = null;
+	firstBrowserControl = BrowserControlFactory.newBrowserControl();
+	assertNotNull(firstBrowserControl);
+	BrowserControlCanvas canvas = (BrowserControlCanvas)
+	    firstBrowserControl.queryInterface(BrowserControl.BROWSER_CONTROL_CANVAS_NAME);
+	eventRegistration = (EventRegistration2)
+	    firstBrowserControl.queryInterface(BrowserControl.EVENT_REGISTRATION_NAME);
+
+	assertNotNull(canvas);
+	Frame frame = new Frame();
+	frame.setUndecorated(true);
+	frame.setBounds(0, 0, 640, 480);
+	frame.add(canvas, BorderLayout.CENTER);
+	frame.setVisible(true);
+	canvas.setVisible(true);
+	
+	Navigation2 nav = (Navigation2) 
+	    firstBrowserControl.queryInterface(BrowserControl.NAVIGATION_NAME);
+	assertNotNull(nav);
+	final CurrentPage2 currentPage = (CurrentPage2) 
+          firstBrowserControl.queryInterface(BrowserControl.CURRENT_PAGE_NAME);
+	
+	assertNotNull(currentPage);
+
+	//
+	// try loading a file over HTTP
+	//
+	
+	CurrentPageTest.keepWaiting = true;
+	
+
+	eventRegistration.addDocumentLoadListener(listener = new DocumentLoadListenerImpl() {
+		public void doEndCheck() {
+		    try {
+			Map responseHeaders = currentPage.getResponseHeaders();
+			assertNotNull(responseHeaders);
+			String server = (String) responseHeaders.get("Server");
+			assertNotNull(server);
+			assertEquals("THTTPD", server);
+		    }
+		    finally {
+			CurrentPageTest.keepWaiting = false;
+		    }
+		}
+	    });
+
+	String url = "http://www.jdocs.com/jsp/2.0/api/index.html"; //"http://localhost:5243/HttpNavigationTest.txt";
+
+	Thread.currentThread().sleep(3000);
+	
+	nav.loadURL(url);
+	
+	// keep waiting until the previous load completes
+	while (CurrentPageTest.keepWaiting) {
+	    Thread.currentThread().sleep(1000);
+	}
+	eventRegistration.removeDocumentLoadListener(listener);
+
+	frame.setVisible(false);
+	BrowserControlFactory.deleteBrowserControl(firstBrowserControl);
+    }
+
+    public void NOTtestHttpPost() throws Exception {
+	BrowserControl firstBrowserControl = null;
+	DocumentLoadListenerImpl listener = null;
+	Selection selection = null;
+	firstBrowserControl = BrowserControlFactory.newBrowserControl();
+	assertNotNull(firstBrowserControl);
+	BrowserControlCanvas canvas = (BrowserControlCanvas)
+	    firstBrowserControl.queryInterface(BrowserControl.BROWSER_CONTROL_CANVAS_NAME);
+	eventRegistration = (EventRegistration2)
+	    firstBrowserControl.queryInterface(BrowserControl.EVENT_REGISTRATION_NAME);
+
+	assertNotNull(canvas);
+	Frame frame = new Frame();
+	frame.setUndecorated(true);
+	frame.setBounds(0, 0, 640, 480);
+	frame.add(canvas, BorderLayout.CENTER);
+	frame.setVisible(true);
+	canvas.setVisible(true);
+	
+	Navigation2 nav = (Navigation2) 
+	    firstBrowserControl.queryInterface(BrowserControl.NAVIGATION_NAME);
+	assertNotNull(nav);
+	final CurrentPage2 currentPage = (CurrentPage2) 
+          firstBrowserControl.queryInterface(BrowserControl.CURRENT_PAGE_NAME);
+	
+	assertNotNull(currentPage);
+
+	//
+	// try loading a file over HTTP
+	//
+	
+	CurrentPageTest.keepWaiting = true;
+	
+
+	eventRegistration.addDocumentLoadListener(listener = new DocumentLoadListenerImpl() {
+		public void doEndCheck() {
+		    currentPage.selectAll();
+		    Selection selection = currentPage.getSelection();
+		    CurrentPageTest.keepWaiting = false;
+		    assertTrue(-1 != selection.toString().indexOf("This file was downloaded over HTTP."));
+		    System.out.println("Selection is: " + 
+				       selection.toString());
+		}
+	    });
+
+	String url = "http://localhost:5243/HttpCurrentPageTest.txt";
+
+	Thread.currentThread().sleep(3000);
+	
+	nav.post(url, null, "PostData\r\n", "X-WakaWaka: true\r\n\r\n");
+	
+	// keep waiting until the previous load completes
+	while (CurrentPageTest.keepWaiting) {
+	    Thread.currentThread().sleep(1000);
+	}
+	eventRegistration.removeDocumentLoadListener(listener);
+
+	frame.setVisible(false);
+	BrowserControlFactory.deleteBrowserControl(firstBrowserControl);
+    }
+
+}
diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/DocumentLoadListenerImpl.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/DocumentLoadListenerImpl.java
index a21e2c96a35..9904a8dc0b6 100644
--- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/DocumentLoadListenerImpl.java
+++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/DocumentLoadListenerImpl.java
@@ -1,5 +1,5 @@
 /*
- * $Id: DocumentLoadListenerImpl.java,v 1.1 2004-06-23 19:58:12 edburns%acm.org Exp $
+ * $Id: DocumentLoadListenerImpl.java,v 1.2 2004-09-03 19:04:22 edburns%acm.org Exp $
  */
 
 /* 
@@ -31,6 +31,9 @@ public abstract class DocumentLoadListenerImpl implements DocumentLoadListener {
 	public void eventDispatched(WebclientEvent event) {
 	    if (event instanceof DocumentLoadEvent) {
 		switch ((int) event.getType()) {
+		case ((int) DocumentLoadEvent.START_DOCUMENT_LOAD_EVENT_MASK):
+		    doStartCheck();
+		    break;
 		case ((int) DocumentLoadEvent.END_DOCUMENT_LOAD_EVENT_MASK):
 		    doEndCheck();
 		    break;
@@ -40,6 +43,8 @@ public abstract class DocumentLoadListenerImpl implements DocumentLoadListener {
 		}
 	    }
 	}	
+
+        public void doStartCheck() {}
 	
 	public void doEndCheck() {}
 
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 678c7edb00e..691ea02e557 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.18 2004-06-24 16:23:42 edburns%acm.org Exp $
+ * $Id: NavigationTest.java,v 1.19 2004-09-03 19:04:22 edburns%acm.org Exp $
  */
 
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -26,11 +26,8 @@
 
 package org.mozilla.webclient;
 
-import org.mozilla.util.THTTPD;
-
-import junit.framework.TestSuite;
-import junit.framework.TestResult;
 import junit.framework.Test;
+import junit.framework.TestSuite;
 
 import java.util.Enumeration;
 
@@ -55,30 +52,11 @@ public class NavigationTest 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(NavigationTest.class);
 	return (result);
     }
 
-    static THTTPD.ServerThread serverThread;
-
     static EventRegistration2 eventRegistration;
 
     static boolean keepWaiting;
diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java
index 8a6ebec56d4..c4fefb8a486 100644
--- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java
+++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java
@@ -1,5 +1,5 @@
 /*
- * $Id: WebclientTestCase.java,v 1.7 2004-06-23 17:08:23 edburns%acm.org Exp $
+ * $Id: WebclientTestCase.java,v 1.8 2004-09-03 19:04:22 edburns%acm.org Exp $
  */
 
 /* 
@@ -32,11 +32,17 @@ import java.util.ArrayList;
 import java.util.List;
 
 import java.io.IOException;
+import java.io.File;
 
 import org.mozilla.util.Assert;
 import org.mozilla.util.ParameterCheck;
 
 import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.framework.TestResult;
+import junit.framework.Test;
+
+import org.mozilla.util.THTTPD;
 
 /**
  *
@@ -44,7 +50,7 @@ import junit.framework.TestCase;
  *
  * <B>Lifetime And Scope</B> <P>
  *
- * @version $Id: WebclientTestCase.java,v 1.7 2004-06-23 17:08:23 edburns%acm.org Exp $
+ * @version $Id: WebclientTestCase.java,v 1.8 2004-09-03 19:04:22 edburns%acm.org Exp $
  * 
  * @see	Blah
  * @see	Bloo
@@ -65,6 +71,8 @@ public static final String OUTPUT_FILE_ROOT = "./build.test/";
 // Class Variables
 //
 
+    static THTTPD.ServerThread serverThread;
+
 //
 // Instance Variables
 //
@@ -104,6 +112,28 @@ public void setUp()
 // General Methods
 //
 
+public static TestSuite createServerTestSuite() {
+    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();
+	    }
+	};
+	return result;
+}
+
 /**
 
 * assertTrue that the string logModuleName is a correct log module