5 files changed, 453 insertions, 0 deletions
diff --git a/dom/archivereader/test/helpers.js b/dom/archivereader/test/helpers.js
new file mode 100644
index 000000000..3ba430436
--- /dev/null
+++ b/dom/archivereader/test/helpers.js
@@ -0,0 +1,31 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+var testGenerator;
+
+function runTest()
+{
+  SimpleTest.waitForExplicitFinish();
+
+  SpecialPowers.pushPrefEnv({'set': [ ["dom.archivereader.enabled", true] ]}, function() {
+    SpecialPowers.createFiles(filesToCreate(),
+                              function (files) {
+                                testGenerator = testSteps(files);
+                                return testGenerator.next();
+                              },
+                              function (msg) {
+                                ok(false, "File creation error: " + msg);
+                                finishTest();
+                              });
+  });
+}
+
+function finishTest()
+{
+  SpecialPowers.popPrefEnv(function() {
+    testGenerator.close();
+    SimpleTest.finish();
+  });
+}
diff --git a/dom/archivereader/test/mochitest.ini b/dom/archivereader/test/mochitest.ini
new file mode 100644
index 000000000..6cf9e9c43
--- /dev/null
+++ b/dom/archivereader/test/mochitest.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+support-files =
+  helpers.js
+
+[test_basic.html]
+[test_nonUnicode.html]
+[test_zip_in_zip.html]
diff --git a/dom/archivereader/test/test_basic.html b/dom/archivereader/test/test_basic.html
new file mode 100644
index 000000000..b3e5ab852
--- /dev/null
+++ b/dom/archivereader/test/test_basic.html
@@ -0,0 +1,227 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+<head>
+  <title>Archive Reader Test</title>
+
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+
+  <script type="text/javascript;version=1.7">
+  function filesToCreate() {
+    var binaryString = '504B03040A00000000002E6BF14000000000000000000000000005001C00746573742F555409000337CA055039CA055075780B' +
+                       '000104E803000004E8030000504B03041400000008002D6BF1401780E15015000000580200000A001C00746573742F612E7478' +
+                       '74555409000336CA05503ACA055075780B000104E803000004E8030000CB48CDC9C95728CF2FCA49E1CA18658FB2A9C4060050' +
+                       '4B03040A00000000002F88EC40662E847010000000100000000A001C00746573742F622E74787455540900035A65FF4F42C505' +
+                       '5075780B000104E803000004E803000068656C6C6F20776F726C642C2032210A504B01021E030A00000000002E6BF140000000' +
+                       '000000000000000000050018000000000000001000FD4100000000746573742F555405000337CA055075780B000104E8030000' +
+                       '04E8030000504B01021E031400000008002D6BF1401780E15015000000580200000A0018000000000001000000B4813F000000' +
+                       '746573742F612E747874555405000336CA055075780B000104E803000004E8030000504B01021E030A00000000002F88EC4066' +
+                       '2E847010000000100000000A0018000000000001000000B48198000000746573742F622E74787455540500035A65FF4F75780B' +
+                       '000104E803000004E8030000504B05060000000003000300EB000000EC0000000000';
+
+    var binaryData = "";
+    for (var i = 0, len = binaryString.length / 2; i < len; ++i) {
+      var hex = binaryString[i * 2] + binaryString[i * 2 + 1];
+      binaryData += String.fromCharCode(parseInt(hex,16));
+    }
+
+    return [ {name: "fileArchiveReader.zip", data: binaryData},
+             {name: "fileArchiveReader.txt", data: "Hello World"}];
+  }
+
+  handleFinished = 0;
+  function markTestDone() {
+    ++handleFinished;
+    if (isFinished()) {
+      finishTest();
+    }
+  }
+  function isFinished() {
+    return handleFinished == 6;
+  }
+
+  function testSteps(files)
+  {
+    var binaryFile = files[0];
+    var textFile = files[1];
+
+    var status;
+
+    // Create - wrong 1
+    try {
+      var r = new ArchiveReader();
+      status = false;
+    }
+    catch(e) {
+      status = true;
+    }
+    ok(status, "ArchiveReader() without args MUST fail");
+
+    // Create - wrong 2
+    try {
+      var r = new ArchiveReader(true);
+      status = false;
+    }
+    catch(e) {
+      status = true;
+    }
+    ok(status, "ArchiveReader() without a blob arg MUST fail");
+
+    // Create - wrong 3
+    try {
+      var r = new ArchiveReader("hello world");
+      status = false;
+    }
+    catch(e) {
+      status = true;
+    }
+    ok(status, "ArchiveReader() without a blob arg MUST fail");
+
+    // Create - good! (but with a text file)
+    var rt = new ArchiveReader(textFile);
+    isnot(rt, null, "ArchiveReader cannot be null");
+
+    // GetFilename
+    var handle = rt.getFilenames();
+    isnot(handle, null, "ArchiveReader.getFilenames() cannot be null");
+    handle.onsuccess = function() {
+      ok(false, "ArchiveReader.getFilenames() should return a 'failure' if the input file is not a zip");
+      markTestDone();
+    }
+    handle.onerror = function() {
+      ok(true, "ArchiveReader.getFilenames() should return a 'error' if the input file is a zip file");
+      is(this.reader, rt, "ArchiveRequest.reader == ArchiveReader");
+      markTestDone();
+    }
+
+    // Create - good!
+    var r = new ArchiveReader(binaryFile);
+    isnot(r, null, "ArchiveReader cannot be null");
+
+    // GetFilename
+    handle = r.getFilenames();
+    isnot(handle, null, "ArchiveReader.getFilenames() cannot be null");
+    handle.onsuccess = function() {
+      ok(true, "ArchiveReader.getFilenames() should return a 'success'");
+      is(this.result instanceof Array, true, "ArchiveReader.getFilenames() should return an array");
+      is(this.result.length, 2, "ArchiveReader.getFilenames(): the array contains 2 items");
+      is(this.result[0], "test/a.txt", "ArchiveReader.getFilenames(): first file is 'test/a.txt'");
+      is(this.result[1], "test/b.txt", "ArchiveReader.getFilenames(): second file is 'test/b.txt'");
+      ok(this.reader, r, "ArchiveRequest.reader should be == ArchiveReader");
+      markTestDone();
+    }
+    handle.onerror = function() {
+      ok(false, "ArchiveReader.getFilenames() should not return any 'error'");
+      markTestDone();
+    }
+
+    // GetFile - wrong (no args)
+    try {
+      r.getFile();
+      status = false;
+    }
+    catch(e) {
+      status = true;
+    }
+    ok(status, "ArchiveReader.getFile() without args fail");
+
+    var handle2 = r.getFile("hello world");
+    isnot(handle2, null, "ArchiveReader.getFile() cannot be null");
+    handle2.onsuccess = function() {
+      ok(false, "ArchiveReader.getFile('unknown file') should not return a 'success'");
+      markTestDone();
+    }
+    handle2.onerror = function() {
+      ok(true, "ArchiveReader.getFile('unknown file') should return an 'error'");
+      ok(this.reader, r, "ArchiveRequest.reader should be == ArchiveReader");
+      markTestDone();
+    }
+
+    var handle3 = r.getFile("test/b.txt");
+    isnot(handle3, null, "ArchiveReader.getFile() cannot be null");
+    handle3.onsuccess = function() {
+      ok(true, "ArchiveReader.getFile('test/b.txt') should return a 'success'");
+      ok(this.reader, r, "ArchiveRequest.reader should be == ArchiveReader");
+      is(this.result.name, "test/b.txt", "ArchiveReader.getFile('test/b.txt') the name MUST be 'test/b.txt'");
+      is(this.result.type, "text/plain", "ArchiveReader.getFile('test/b.txt') the type MUST be 'text/plain'");
+
+      var fr = new FileReader();
+      fr.readAsText(this.result);
+      fr.onerror = function() {
+        ok(false, "ArchiveReader + FileReader should work!");
+        markTestDone();
+      }
+      fr.onload = function(event) {
+        is(event.target.result, "hello world, 2!\n", "ArchiveReader + FileReader are working together.");
+        markTestDone();
+      }
+    }
+
+    handle3.onerror = function() {
+      ok(false, "ArchiveReader.getFile('test/b.txt') should not return an 'error'");
+      markTestDone();
+    }
+
+    var handle4 = r.getFile("test/a.txt");
+    isnot(handle4, null, "ArchiveReader.getFile() cannot be null");
+    handle4.onsuccess = function() {
+      ok(true, "ArchiveReader.getFile('test/a.txt') should return a 'success'");
+      ok(this.reader, r, "ArchiveRequest.reader should be == ArchiveReader");
+      is(this.result.name, "test/a.txt", "ArchiveReader.getFile('test/a.txt') the name MUST be 'test/a.txt'");
+      is(this.result.type, "text/plain", "ArchiveReader.getFile('test/a.txt') the type MUST be 'text/plain'");
+
+      var fr = new FileReader();
+      fr.readAsText(this.result);
+      fr.onerror = function() {
+        ok(false, "ArchiveReader + FileReader should work!");
+        markTestDone();
+      }
+      fr.onload = function(event) {
+        is(event.target.result.length, 600, "ArchiveReader + FileReader are working with a compress data");
+        var p = event.target.result.trim().split('\n');
+        is(p.length, 50, "ArchiveReader + FileReader are working with a compress data");
+
+        for (var i = 0; i < p.length; ++i)
+          is(p[i], "hello world", "ArchiveReader + FileReader are working with a compress data");
+        markTestDone();
+      }
+    }
+    handle4.onerror = function() {
+      ok(false, "ArchiveReader.getFile('test/a.txt') should not return an 'error'");
+      markTestDone();
+    }
+
+    var handle5 = r.getFiles();
+    isnot(handle5, null, "ArchiveReader.getFiles() cannot be null");
+    handle5.onsuccess = function() {
+      ok(true, "ArchiveReader.getFiles() should return a 'success'");
+      ok(this.reader, r, "ArchiveRequest.reader should be == ArchiveReader");
+
+      is(this.result.length, 2, "ArchiveReader.getFilenames(): the array contains 2 items");
+      is(this.result[0].name, "test/a.txt", "ArchiveReader.getFilenames(): first file is 'test/a.txt'");
+      is(this.result[1].name, "test/b.txt", "ArchiveReader.getFilenames(): second file is 'test/b.txt'");
+      is(this.result[0].type, "text/plain", "ArchiveReader.getFile('test/a.txt') the type MUST be 'text/plain'");
+      is(this.result[1].type, "text/plain", "ArchiveReader.getFile('test/a.txt') the type MUST be 'text/plain'");
+
+      markTestDone();
+    }
+    handle5.onerror = function() {
+      ok(false, "ArchiveReader.getFiles() should not return an 'error'");
+      markTestDone();
+    }
+    yield undefined;
+  }
+
+  </script>
+  <script type="text/javascript;version=1.7" src="helpers.js"></script>
+</head>
+
+<body onload="runTest();">
+<p id="display">
+</p>
+</body>
+
+</html>
diff --git a/dom/archivereader/test/test_nonUnicode.html b/dom/archivereader/test/test_nonUnicode.html
new file mode 100644
index 000000000..6237ce10f
--- /dev/null
+++ b/dom/archivereader/test/test_nonUnicode.html
@@ -0,0 +1,77 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+<head>
+  <title>Archive Reader Non-Unicode Test</title>
+
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+
+  <script type="text/javascript;version=1.7">
+  function filesToCreate() {
+    var binaryData = "";
+    for (var i = 0, len = binaryString.length / 2; i < len; ++i) {
+      var hex = binaryString[i * 2] + binaryString[i * 2 + 1];
+      binaryData += String.fromCharCode(parseInt(hex,16));
+    }
+    return [ {name: "fileArchiveReader_nonUnicode.zip", data: binaryData} ];
+  }
+
+  function test1(binaryFile)
+  {
+    var r = new ArchiveReader(binaryFile, { encoding: "ISO-8859-1" });
+    isnot(r, null, "ArchiveReader cannot be null");
+
+    // GetFilename
+    var handle = r.getFilenames();
+    isnot(handle, null, "ArchiveReader.getFilenames() cannot be null");
+    handle.onsuccess = function() {
+      ok(true, "ArchiveReader.getFilenames() should return a 'success'");
+      is(this.result instanceof Array, true, "ArchiveReader.getFilenames() should return an array");
+      is(this.result.length, 1, "ArchiveReader.getFilenames(): the array contains 1 item");
+      ok(this.reader, r, "ArchiveRequest.reader should be == ArchiveReader");
+      dump('Content: ' + this.result[0] + '\n');
+      test2(binaryFile);
+    }
+  }
+
+  function test2(binaryFile)
+  {
+    try {
+      new ArchiveReader(binaryFile, { encoding: "random stuff" });
+      ok(false, "Should have thrown for bogus encoding label.");
+    } catch (e) {
+      ok(e instanceof RangeError, "Expected a RangeError");
+    }
+    finishTest();
+  }
+
+  function testSteps(files)
+  {
+    test1(files[0]);
+    yield undefined;
+  }
+
+
+  </script>
+  <script type="text/javascript;version=1.7" src="helpers.js"></script>
+
+</head>
+
+<body onload="runTest();">
+<p id="display">
+</p>
+<script type="text/javascript;version=1.7">
+var binaryString = '' +
+'504B0304140000000000255D094100000000000000000000000002000000912F504B03040A0000000000285D09416BB50A5A' +
+'010000000100000007000000912F9B2E747874D8504B01023F00140000000000255D09410000000000000000000000000200' +
+'24000000000000001000000000000000912F0A002000000000000100180062505F1A1376CD0162505F1A1376CD01FE3F8D59' +
+'1176CD01504B01023F000A0000000000285D09416BB50A5A0100000001000000070024000000000000002000000020000000' +
+'912F9B2E7478740A0020000000000001001800565EF41D1376CD0107BD73631176CD0107BD73631176CD01504B0506000000' +
+'0002000200AD000000460000000000';
+</script>
+</body>
+
+</html>
diff --git a/dom/archivereader/test/test_zip_in_zip.html b/dom/archivereader/test/test_zip_in_zip.html
new file mode 100644
index 000000000..7e381a1ef
--- /dev/null
+++ b/dom/archivereader/test/test_zip_in_zip.html
@@ -0,0 +1,111 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+<head>
+  <title>Archive Reader Zip-In-Zip Test</title>
+
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+
+  <script type="text/javascript;version=1.7">
+  function filesToCreate() {
+    var binaryData = "";
+    for (var i = 0, len = binaryString.length / 2; i < len; ++i) {
+      var hex = binaryString[i * 2] + binaryString[i * 2 + 1];
+      binaryData += String.fromCharCode(parseInt(hex,16));
+    }
+    return [ {name: "fileArchiveReader_42.zip", data: binaryData} ];
+  }
+
+  function testSteps(files)
+  {
+    var binaryFile = files[0];
+
+    // The input is 4 nested zip archives:
+    doLoop(binaryFile, 4);
+
+    yield undefined;
+  }
+
+  function doLoop(blob, loop)
+  {
+    var r = new ArchiveReader(blob);
+    isnot(r, null, "ArchiveReader cannot be null");
+
+    // GetFilename
+    var handle = r.getFilenames();
+    isnot(handle, null, "ArchiveReader.getFilenames() cannot be null");
+    handle.onsuccess = function() {
+      ok(true, "ArchiveReader.getFilenames() should return a 'success'");
+      is(this.result instanceof Array, true, "ArchiveReader.getFilenames() should return an array");
+      is(this.result.length, 1, "ArchiveReader.getFilenames(): the array contains 1 item");
+      ok(this.reader, r, "ArchiveRequest.reader should be == ArchiveReader");
+
+      dump('Content:\n');
+      for (var i = 0; i < this.result.length; ++i)
+        dump(' * ' + this.result[i] + '\n');
+
+      var handle = r.getFile(this.result[0]);
+      handle.onerror = function() {
+        ok(false, "ArchiveReader.getFile() should not return any 'error'");
+      }
+      handle.onsuccess = function() {
+        ok(true, "ArchiveReader.getFilenames() should return a 'success'");
+        ok(this.reader, r, "ArchiveRequest.reader should be == ArchiveReader");
+
+        if (loop > 0)
+          doLoop(this.result, loop - 1);
+        else
+          doLastLoop(this.result);
+      }
+    }
+    handle.onerror = function() {
+      ok(false, "ArchiveReader.getFilenames() should not return any 'error'");
+    }
+  }
+
+  function doLastLoop(blob)
+  {
+    ok(blob.size == 262144, "The last file size is wrong");
+    ok(blob.name == 'empty.dat', "The last filename is wrong");
+    finishTest();
+  }
+
+  </script>
+  <script type="text/javascript;version=1.7" src="helpers.js"></script>
+
+</head>
+
+<body onload="runTest();">
+<p id="display">
+</p>
+<script type="text/javascript;version=1.7">
+var binaryString = '' +
+'504B03040A0000000000B0620E415F715F15970300009703000005001C00642E7A69705554090003AC262A50AC262A507578' +
+'0B000104E803000004E8030000504B03040A0000000000B0620E41CFE25F1EF7020000F702000005001C00632E7A69705554' +
+'090003AC262A50AC262A5075780B000104E803000004E8030000504B03040A0000000000B0620E4107D702A4570200005702' +
+'000005001C00622E7A69705554090003AC262A50AC262A5075780B000104E803000004E8030000504B03040A0000000000B0' +
+'620E417E45286DB7010000B701000005001C00612E7A69705554090003AC262A50AC262A5075780B000104E803000004E803' +
+'0000504B0304140000000800F7610E41784909B70F0100000000040009001C00656D7074792E646174555409000351252A50' +
+'57252A5075780B000104E803000004E8030000EDC13101000000C2A0FEA9E76D07A000000000000000000000000000000000' +
+'0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' +
+'0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' +
+'0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' +
+'0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' +
+'0000000000000000000000000000000000000000000000000000000000000000000000000000DE00504B01021E0314000000' +
+'0800F7610E41784909B70F01000000000400090018000000000001000000B48100000000656D7074792E6461745554050003' +
+'51252A5075780B000104E803000004E8030000504B050600000000010001004F000000520100000000504B01021E030A0000' +
+'000000B0620E417E45286DB7010000B7010000050018000000000000000000B48100000000612E7A69705554050003AC262A' +
+'5075780B000104E803000004E8030000504B050600000000010001004B000000F60100000000504B01021E030A0000000000' +
+'B0620E4107D702A45702000057020000050018000000000000000000B48100000000622E7A69705554050003AC262A507578' +
+'0B000104E803000004E8030000504B050600000000010001004B000000960200000000504B01021E030A0000000000B0620E' +
+'41CFE25F1EF7020000F7020000050018000000000000000000B48100000000632E7A69705554050003AC262A5075780B0001' +
+'04E803000004E8030000504B050600000000010001004B000000360300000000504B01021E030A0000000000B0620E415F71' +
+'5F159703000097030000050018000000000000000000B48100000000642E7A69705554050003AC262A5075780B000104E803' +
+'000004E8030000504B050600000000010001004B000000D60300000000';
+</script>
+</body>
+
+</html>