mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
bug 304414
- Run TestCookie in make check - Make TestCookie return an error code if the test failed - Mention the tested bug# in test_cookie_header.js - Add a test for bug 304414: Make sure that local streams behave "sanely" (don't return PR_UINT32_MAX, don't return PR_INT32_MAX, don't have more data at EOF) and can read the entire file. r=bz
This commit is contained in:
parent
847e149c52
commit
4868e46b76
@ -100,11 +100,13 @@ _UNIT_FILES = unit/test_all.sh \
|
|||||||
unit/test_http_headers.js \
|
unit/test_http_headers.js \
|
||||||
unit/test_cookie_header.js \
|
unit/test_cookie_header.js \
|
||||||
unit/test_parse_content_type.js \
|
unit/test_parse_content_type.js \
|
||||||
|
unit/test_localstreams.js \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
libs:: $(_UNIT_FILES)
|
libs:: $(_UNIT_FILES)
|
||||||
$(INSTALL) $^ $(DIST)/bin/necko_unit_tests
|
$(INSTALL) $^ $(DIST)/bin/necko_unit_tests
|
||||||
|
|
||||||
check::
|
check::
|
||||||
|
$(RUN_TEST_PROGRAM) $(DIST)/bin/TestCookie
|
||||||
$(RUN_TEST_PROGRAM) $(DIST)/bin/necko_unit_tests/test_all.sh
|
$(RUN_TEST_PROGRAM) $(DIST)/bin/necko_unit_tests/test_all.sh
|
||||||
|
|
||||||
_RES_FILES = urlparse.dat \
|
_RES_FILES = urlparse.dat \
|
||||||
|
@ -565,5 +565,5 @@ main(PRInt32 argc, char *argv[])
|
|||||||
|
|
||||||
NS_ShutdownXPCOM(nsnull);
|
NS_ShutdownXPCOM(nsnull);
|
||||||
|
|
||||||
return 0;
|
return allTestsPassed ? 0 : 1;
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
// This file tests bug 250375
|
||||||
|
|
||||||
function check_request_header(chan, name, value) {
|
function check_request_header(chan, name, value) {
|
||||||
var chanValue;
|
var chanValue;
|
||||||
try {
|
try {
|
||||||
|
81
netwerk/test/unit/test_localstreams.js
Normal file
81
netwerk/test/unit/test_localstreams.js
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
// Tests bug 304414
|
||||||
|
|
||||||
|
function getDir(key) {
|
||||||
|
var dirSvc = Components.classes["@mozilla.org/file/directory_service;1"]
|
||||||
|
.getService(Components.interfaces.nsIProperties);
|
||||||
|
return dirSvc.get(key, Components.interfaces.nsILocalFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Does some sanity checks on the stream and returns the number of bytes read
|
||||||
|
// when the checks passed.
|
||||||
|
function test_stream(stream) {
|
||||||
|
// This test only handles blocking streams; that's desired for file streams
|
||||||
|
// anyway.
|
||||||
|
do_check_eq(stream.isNonBlocking(), false);
|
||||||
|
|
||||||
|
// Wrap it in a binary stream (to avoid wrong results that
|
||||||
|
// scriptablestream would produce with binary content)
|
||||||
|
var binstream = Components.classes['@mozilla.org/binaryinputstream;1']
|
||||||
|
.createInstance(Components.interfaces.nsIBinaryInputStream);
|
||||||
|
binstream.setInputStream(stream);
|
||||||
|
|
||||||
|
var numread = 0;
|
||||||
|
for (;;) {
|
||||||
|
do_check_eq(stream.available(), binstream.available());
|
||||||
|
var avail = stream.available();
|
||||||
|
do_check_neq(avail, -1);
|
||||||
|
|
||||||
|
// PR_UINT32_MAX and PR_INT32_MAX; the files we're testing with aren't that
|
||||||
|
// large.
|
||||||
|
do_check_neq(avail, Math.pow(2, 32) - 1);
|
||||||
|
do_check_neq(avail, Math.pow(2, 31) - 1);
|
||||||
|
|
||||||
|
if (!avail) {
|
||||||
|
// For blocking streams, available() only returns 0 on EOF
|
||||||
|
// Make sure that there is really no data left
|
||||||
|
var could_read = false;
|
||||||
|
try {
|
||||||
|
binstream.readByteArray(1);
|
||||||
|
could_read = true;
|
||||||
|
} catch (e) {
|
||||||
|
// We expect the exception, so do nothing here
|
||||||
|
}
|
||||||
|
if (could_read)
|
||||||
|
do_throw("Data readable when available indicated EOF!");
|
||||||
|
return numread;
|
||||||
|
}
|
||||||
|
|
||||||
|
dump("Trying to read " + avail + " bytes\n");
|
||||||
|
// Note: Verification that this does return as much bytes as we asked for is
|
||||||
|
// done in the binarystream implementation
|
||||||
|
var data = binstream.readByteArray(avail);
|
||||||
|
|
||||||
|
numread += avail;
|
||||||
|
}
|
||||||
|
return numread;
|
||||||
|
}
|
||||||
|
|
||||||
|
function stream_for_file(file) {
|
||||||
|
var str = Components.classes["@mozilla.org/network/file-input-stream;1"]
|
||||||
|
.createInstance(Components.interfaces.nsIFileInputStream);
|
||||||
|
str.init(file, 0, 0, 0);
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
|
||||||
|
function stream_from_channel(file) {
|
||||||
|
var ios = Components.classes["@mozilla.org/network/io-service;1"]
|
||||||
|
.getService(Components.interfaces.nsIIOService);
|
||||||
|
var uri = ios.newFileURI(file);
|
||||||
|
return ios.newChannelFromURI(uri).open();
|
||||||
|
}
|
||||||
|
|
||||||
|
function run_test() {
|
||||||
|
// Get a file and a directory in order to do some testing
|
||||||
|
var file = getDir("XpcomLib");
|
||||||
|
var len = file.fileSize;
|
||||||
|
do_check_eq(test_stream(stream_for_file(file)), len);
|
||||||
|
do_check_eq(test_stream(stream_from_channel(file)), len);
|
||||||
|
var dir = file.parent;
|
||||||
|
test_stream(stream_from_channel(dir)); // Can't do size checking
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user