Loading modules/libjar/zipwriter/src/nsDeflateConverter.cpp +4 −0 Original line number Original line Diff line number Diff line Loading @@ -85,6 +85,10 @@ nsresult nsDeflateConverter::Init() mZstream.next_out = mWriteBuffer; mZstream.next_out = mWriteBuffer; mZstream.avail_out = sizeof(mWriteBuffer); mZstream.avail_out = sizeof(mWriteBuffer); // mark the input buffer as empty. mZstream.avail_in = 0; mZstream.next_in = Z_NULL; return NS_OK; return NS_OK; } } Loading modules/libjar/zipwriter/test/unit/data/emptyfile.txt 0 → 100644 +0 −0 Empty file added. modules/libjar/zipwriter/test/unit/test_bug419769_1.js 0 → 100644 +104 −0 Original line number Original line Diff line number Diff line /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * 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 Zip Writer Component. * * The Initial Developer of the Original Code is * Dave Townsend <dtownsend@oxymoronical.com>. * * Portions created by the Initial Developer are Copyright (C) 2008 * the Initial Developer. All Rights Reserved. * * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ const DATA = ""; const FILENAME = "test.txt"; const CRC = 0x00000000; const time = Date.now(); function testpass(source) { // Should exist. do_check_true(source.hasEntry(FILENAME)); var entry = source.getEntry(FILENAME); do_check_neq(entry, null); do_check_false(entry.isDirectory); // Should be stored do_check_eq(entry.compression, ZIP_METHOD_DEFLATE); var diff = Math.abs((entry.lastModifiedTime / PR_USEC_PER_MSEC) - time); if (diff > TIME_RESOLUTION) do_throw(diff); // File size should match our data size. do_check_eq(entry.realSize, DATA.length); // Check that the CRC is accurate do_check_eq(entry.CRC32, CRC); } function run_test() { zipW.open(tmpFile, PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE); // Shouldn't be there to start with. do_check_false(zipW.hasEntry(FILENAME)); do_check_false(zipW.inQueue); var stream = Cc["@mozilla.org/io/string-input-stream;1"] .createInstance(Ci.nsIStringInputStream); stream.setData(DATA, DATA.length); zipW.addEntryStream(FILENAME, time * PR_USEC_PER_MSEC, Ci.nsIZipWriter.COMPRESSION_BEST, stream, false); // Check that zip state is right at this stage. testpass(zipW); zipW.close(); // Check to see if we get the same results loading afresh. zipW.open(tmpFile, PR_RDWR); testpass(zipW); zipW.close(); // Test the stored data with the zipreader var zipR = new ZipReader(tmpFile); testpass(zipR); zipR.test(FILENAME); var stream = Cc["@mozilla.org/scriptableinputstream;1"] .createInstance(Ci.nsIScriptableInputStream); stream.init(zipR.getInputStream(FILENAME)); var result = stream.read(DATA.length); stream.close(); zipR.close(); do_check_eq(result, DATA); } modules/libjar/zipwriter/test/unit/test_bug419769_2.js 0 → 100644 +97 −0 Original line number Original line Diff line number Diff line /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * 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 Zip Writer Component. * * The Initial Developer of the Original Code is * Dave Townsend <dtownsend@oxymoronical.com>. * * Portions created by the Initial Developer are Copyright (C) 2008 * the Initial Developer. All Rights Reserved. * * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ const DATA = ""; const FILENAME = "test.txt"; const CRC = 0x00000000; const time = Date.now(); function testpass(source) { // Should exist. do_check_true(source.hasEntry(FILENAME)); var entry = source.getEntry(FILENAME); do_check_neq(entry, null); do_check_false(entry.isDirectory); // Should be stored do_check_eq(entry.compression, ZIP_METHOD_DEFLATE); // File size should match our data size. do_check_eq(entry.realSize, DATA.length); // Check that the CRC is accurate do_check_eq(entry.CRC32, CRC); } function run_test() { zipW.open(tmpFile, PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE); // Shouldn't be there to start with. do_check_false(zipW.hasEntry(FILENAME)); do_check_false(zipW.inQueue); var file = do_get_file(DATA_DIR + "emptyfile.txt"); zipW.addEntryFile(FILENAME, Ci.nsIZipWriter.COMPRESSION_BEST, file, false); // Check that zip state is right at this stage. testpass(zipW); zipW.close(); // Check to see if we get the same results loading afresh. zipW.open(tmpFile, PR_RDWR); testpass(zipW); zipW.close(); // Test the stored data with the zipreader var zipR = new ZipReader(tmpFile); testpass(zipR); zipR.test(FILENAME); var stream = Cc["@mozilla.org/scriptableinputstream;1"] .createInstance(Ci.nsIScriptableInputStream); stream.init(zipR.getInputStream(FILENAME)); var result = stream.read(DATA.length); stream.close(); zipR.close(); do_check_eq(result, DATA); } Loading
modules/libjar/zipwriter/src/nsDeflateConverter.cpp +4 −0 Original line number Original line Diff line number Diff line Loading @@ -85,6 +85,10 @@ nsresult nsDeflateConverter::Init() mZstream.next_out = mWriteBuffer; mZstream.next_out = mWriteBuffer; mZstream.avail_out = sizeof(mWriteBuffer); mZstream.avail_out = sizeof(mWriteBuffer); // mark the input buffer as empty. mZstream.avail_in = 0; mZstream.next_in = Z_NULL; return NS_OK; return NS_OK; } } Loading
modules/libjar/zipwriter/test/unit/test_bug419769_1.js 0 → 100644 +104 −0 Original line number Original line Diff line number Diff line /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * 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 Zip Writer Component. * * The Initial Developer of the Original Code is * Dave Townsend <dtownsend@oxymoronical.com>. * * Portions created by the Initial Developer are Copyright (C) 2008 * the Initial Developer. All Rights Reserved. * * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ const DATA = ""; const FILENAME = "test.txt"; const CRC = 0x00000000; const time = Date.now(); function testpass(source) { // Should exist. do_check_true(source.hasEntry(FILENAME)); var entry = source.getEntry(FILENAME); do_check_neq(entry, null); do_check_false(entry.isDirectory); // Should be stored do_check_eq(entry.compression, ZIP_METHOD_DEFLATE); var diff = Math.abs((entry.lastModifiedTime / PR_USEC_PER_MSEC) - time); if (diff > TIME_RESOLUTION) do_throw(diff); // File size should match our data size. do_check_eq(entry.realSize, DATA.length); // Check that the CRC is accurate do_check_eq(entry.CRC32, CRC); } function run_test() { zipW.open(tmpFile, PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE); // Shouldn't be there to start with. do_check_false(zipW.hasEntry(FILENAME)); do_check_false(zipW.inQueue); var stream = Cc["@mozilla.org/io/string-input-stream;1"] .createInstance(Ci.nsIStringInputStream); stream.setData(DATA, DATA.length); zipW.addEntryStream(FILENAME, time * PR_USEC_PER_MSEC, Ci.nsIZipWriter.COMPRESSION_BEST, stream, false); // Check that zip state is right at this stage. testpass(zipW); zipW.close(); // Check to see if we get the same results loading afresh. zipW.open(tmpFile, PR_RDWR); testpass(zipW); zipW.close(); // Test the stored data with the zipreader var zipR = new ZipReader(tmpFile); testpass(zipR); zipR.test(FILENAME); var stream = Cc["@mozilla.org/scriptableinputstream;1"] .createInstance(Ci.nsIScriptableInputStream); stream.init(zipR.getInputStream(FILENAME)); var result = stream.read(DATA.length); stream.close(); zipR.close(); do_check_eq(result, DATA); }
modules/libjar/zipwriter/test/unit/test_bug419769_2.js 0 → 100644 +97 −0 Original line number Original line Diff line number Diff line /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * 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 Zip Writer Component. * * The Initial Developer of the Original Code is * Dave Townsend <dtownsend@oxymoronical.com>. * * Portions created by the Initial Developer are Copyright (C) 2008 * the Initial Developer. All Rights Reserved. * * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ const DATA = ""; const FILENAME = "test.txt"; const CRC = 0x00000000; const time = Date.now(); function testpass(source) { // Should exist. do_check_true(source.hasEntry(FILENAME)); var entry = source.getEntry(FILENAME); do_check_neq(entry, null); do_check_false(entry.isDirectory); // Should be stored do_check_eq(entry.compression, ZIP_METHOD_DEFLATE); // File size should match our data size. do_check_eq(entry.realSize, DATA.length); // Check that the CRC is accurate do_check_eq(entry.CRC32, CRC); } function run_test() { zipW.open(tmpFile, PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE); // Shouldn't be there to start with. do_check_false(zipW.hasEntry(FILENAME)); do_check_false(zipW.inQueue); var file = do_get_file(DATA_DIR + "emptyfile.txt"); zipW.addEntryFile(FILENAME, Ci.nsIZipWriter.COMPRESSION_BEST, file, false); // Check that zip state is right at this stage. testpass(zipW); zipW.close(); // Check to see if we get the same results loading afresh. zipW.open(tmpFile, PR_RDWR); testpass(zipW); zipW.close(); // Test the stored data with the zipreader var zipR = new ZipReader(tmpFile); testpass(zipR); zipR.test(FILENAME); var stream = Cc["@mozilla.org/scriptableinputstream;1"] .createInstance(Ci.nsIScriptableInputStream); stream.init(zipR.getInputStream(FILENAME)); var result = stream.read(DATA.length); stream.close(); zipR.close(); do_check_eq(result, DATA); }
