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

This checkin demonstrates that navigation.loadFromStream() works, at

Browse Source 
least in the case of a FileInputStream.  I still can't get the
RandomHTMLInputStream to work.  I'm still waiting on a response from
Darin Fisher on that one.

M build-tests.xml

- comment in all tests

M classes_spec/org/mozilla/webclient/Navigation2.java
M classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java

- add loadFromStreamBlocking, until we have DocumentLoadListener working

M src_moz/InputStreamShim.cpp
M src_moz/InputStreamShim.h

- rollback the nsIAsyncInputStream changes.

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

- test from a FileInputStream

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

- Allow notification when read completes.


git-svn-id: svn://10.0.0.236/trunk@157320 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2004-06-02 17:26:49 +00:00
parent 3b17cca53e
commit 2502c4e603
3 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* $Id: NavigationTest.java,v 1.6 2004-06-02 14:31:24 edburns%acm.org Exp $
* $Id: NavigationTest.java,v 1.7 2004-06-02 17:26:49 edburns%acm.org Exp $
*/
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -59,6 +59,7 @@ public class NavigationTest extends WebclientTestCase {
public void testNavigation() throws Exception {
BrowserControl firstBrowserControl = null;
Selection selection = null;
BrowserControlFactory.setAppData(getBrowserBinDir());
firstBrowserControl = BrowserControlFactory.newBrowserControl();
assertNotNull(firstBrowserControl);
@@ -75,35 +76,53 @@ public class NavigationTest extends WebclientTestCase {
Navigation2 nav = (Navigation2)
firstBrowserControl.queryInterface(BrowserControl.NAVIGATION_NAME);
assertNotNull(nav);
File testPage = new File(getBrowserBinDir(),
"../../java/webclient/test/automated/src/test/NavigationTest.txt");
System.out.println("Loading url: " + testPage.toURL().toString());
nav.loadURLBlocking(testPage.toURL().toString());
CurrentPage2 currentPage = (CurrentPage2)
firstBrowserControl.queryInterface(BrowserControl.CURRENT_PAGE_NAME);
assertNotNull(currentPage);
File testPage = new File(getBrowserBinDir(),
"../../java/webclient/test/automated/src/test/NavigationTest.txt");
// try loading a file: url
System.out.println("Loading url: " + testPage.toURL().toString());
nav.loadURL(testPage.toURL().toString());
Thread.currentThread().sleep(1000);
currentPage.selectAll();
Selection selection = currentPage.getSelection();
selection = currentPage.getSelection();
assertTrue(-1 != selection.toString().indexOf("This test file is for the NavigationTest."));
System.out.println("Selection is: " + selection.toString());
// try loading from a FileInputStream
FileInputStream fis = new FileInputStream(testPage);
nav.loadFromStreamBlocking(fis, "http://somefile.com/",
"text/html", -1, null);
nav.loadFromStream(fis, "http://somefile.com/",
"text/html", -1, null);
currentPage.selectAll();
selection = currentPage.getSelection();
assertTrue(-1 != selection.toString().indexOf("This test file is for the NavigationTest."));
System.out.println("Selection is: " + selection.toString());
// try loading from the dreaded RandomHTMLInputStream
RandomHTMLInputStream rhis = new RandomHTMLInputStream(5, false);
nav.loadFromStreamBlocking(rhis, "http://randomstream.com/",
"text/html", -1, null);
boolean keepWaiting = true;
//while (keepWaiting) {
Thread.currentThread().sleep(8000);
// }
currentPage.selectAll();
selection = currentPage.getSelection();
System.out.println("Selection is: " + selection.toString());
frame.setVisible(false);
BrowserControlFactory.deleteBrowserControl(firstBrowserControl);
BrowserControlFactory.appTerminate();
assertTrue(-1 != selection.toString().indexOf("START Random Data"));
assertTrue(-1 != selection.toString().indexOf("END Random Data"));
}
}

3
mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/RandomHTMLInputStream.java
View File

@@ -104,7 +104,7 @@ public RandomHTMLInputStream(int yourNumReads, boolean yourRandomExceptions)
ParameterCheck.greaterThan(yourNumReads, 1);
randomExceptions = yourRandomExceptions;
random = new Random();
random = new Random(1234);
Assert.assert_it(null != random);
isClosed = false;
@@ -226,6 +226,7 @@ public int read(byte[] b, int off, int len) throws IOException
if (random.nextBoolean()) {
try {
System.out.println("RandomHTMLInputStream:: sleeping");
System.out.flush();
Thread.sleep(3000);
}
catch (Exception e) {