Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This checkin verifies that loading documents over HTTP works as

Browse Source 
expected.

M src_moz/Makefile.in

- added WindowWatcher to compilation

M src_moz/NativeBrowserControl.cpp

- turn on our WindowWatcher.  Still need to flesh this out, but it
  seemed to be necessary for http to work.

M src_moz/WindowCreator.cpp
M src_moz/WindowCreator.h

- return to compilation

M src_moz/WrapperFactoryImpl.cpp

- hack to workaround bug posted to n.p.m.e by me today regarding
  nsIOService::SetOffline(TRUE) being called.  The workaround is to
  manually call nsIOService::SetOffline(FALSE) *after* the point in time
  where the "TRUE" call is made.

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

- tweaks to make this suitable for JUnit testing.

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

- all navigation tests work.


git-svn-id: svn://10.0.0.236/trunk@158322 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2004-06-22 19:23:23 +00:00
parent 2bbd7e4852
commit 0007840201
7 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/java/webclient/test/automated/src/classes/org/mozilla/util/THTTPD.java
View File

@@ -1,5 +1,5 @@
/*
* $Id: THTTPD.java,v 1.1 2004-06-18 13:53:13 edburns%acm.org Exp $
* $Id: THTTPD.java,v 1.2 2004-06-22 19:23:23 edburns%acm.org Exp $
*/
/*
@@ -92,8 +92,10 @@ public class THTTPD extends Object {
V();
while (keepRunning) {
if ((-1 != maxRequests) && numRequests < maxRequests) {
break;
if (numRequests >= maxRequests) {
if (-1 != maxRequests) {
break;
}
}
numRequests++;
try {

12
mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/NavigationTest.java
View File

@@ -1,5 +1,5 @@
/*
* $Id: NavigationTest.java,v 1.14 2004-06-18 13:53:13 edburns%acm.org Exp $
* $Id: NavigationTest.java,v 1.15 2004-06-22 19:23:23 edburns%acm.org Exp $
*/
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -248,8 +248,6 @@ public class NavigationTest extends WebclientTestCase {
BrowserControlFactory.deleteBrowserControl(firstBrowserControl);
}
/**********
public void testHttpLoad() throws Exception {
BrowserControl firstBrowserControl = null;
DocumentListener listener = null;
@@ -285,7 +283,8 @@ public class NavigationTest extends WebclientTestCase {
final THTTPD.ServerThread serverThread =
new THTTPD.ServerThread("LocalHTTPD",
new File (getBrowserBinDir()), 1);
new File (getBrowserBinDir() +
"/../../java/webclient/build.test"), 1);
serverThread.setSoTimeout(15000);
serverThread.start();
serverThread.P();
@@ -303,6 +302,8 @@ public class NavigationTest extends WebclientTestCase {
});
String url = "http://localhost:5243/HttpNavigationTest.txt";
Thread.currentThread().sleep(3000);
nav.loadURL(url);
@@ -316,9 +317,6 @@ public class NavigationTest extends WebclientTestCase {
BrowserControlFactory.deleteBrowserControl(firstBrowserControl);
}
****************/
public static abstract class DocumentListener implements DocumentLoadListener {
public void eventDispatched(WebclientEvent event) {