X-Git-Url: http://git.squeep.com/?p=squeep-mystery-box;a=blobdiff_plain;f=test%2Flib%2Fmystery-box.js;fp=test%2Flib%2Fmystery-box.js;h=dd54a88dae9bfbd67cf0cec3f168e4c78e6bbb81;hp=9f48ff64a6bfeb9390be1242670afcc2445a6d74;hb=2ef5f9c74d92c8eb8cc0bd03fecc9d1a1d306489;hpb=5ce60de5e64a735e575fb02cf8944d1b1d4f000c

diff --git a/test/lib/mystery-box.js b/test/lib/mystery-box.js
index 9f48ff6..dd54a88 100644
--- a/test/lib/mystery-box.js
+++ b/test/lib/mystery-box.js
@@ -5,7 +5,13 @@
 const assert = require('assert');
 const sinon = require('sinon'); // eslint-disable-line node/no-unpublished-require
 const MysteryBox = require('../../lib/mystery-box');
-const stubLogger = require('../stub-logger');
+const crypto = require('crypto');
+
+function _verbose(mb) {
+  if (process.env.VERBOSE_TESTS) {
+    mb.on('statistics', (...args) => console.log(...args));
+  }
+}
 
 describe('MysteryBox', function () {
   let mb, options, object;
@@ -13,7 +19,6 @@ describe('MysteryBox', function () {
     options = {
       encryptionSecret: 'this is not a very good secret',
     };
-    mb = new MysteryBox(stubLogger, options);
   });
   afterEach(function () {
     sinon.restore();
@@ -22,7 +27,7 @@ describe('MysteryBox', function () {
   describe('constructor', function () {
     it('needs a secret', async function () {
       options = {};
-      assert.rejects(() => new MysteryBox(stubLogger, options));
+      assert.rejects(() => new MysteryBox(options));
     });
 
     it('accepts multiple secrets', async function () {
@@ -30,7 +35,8 @@ describe('MysteryBox', function () {
       options = {
         encryptionSecret: ['first poor secret', 'second poor secret'],
       };
-      mb = new MysteryBox(stubLogger, options);
+      mb = new MysteryBox(options);
+      _verbose(mb);
       object = {
         foo: 'bar',
         baz: 'quux',
@@ -42,17 +48,17 @@ describe('MysteryBox', function () {
     });
 
     it('covers options', function () {
-      assert.rejects(() => new MysteryBox(stubLogger));
+      assert.rejects(() => new MysteryBox());
     });
 
     it('covers bad flags', function () {
       options.defaultFlags = 300;
-      assert.rejects(() => new MysteryBox(stubLogger, options), RangeError);
+      assert.rejects(() => new MysteryBox(options), RangeError);
     });
 
     it('covers missing ciphers', function () {
-      sinon.stub(MysteryBox._test.crypto, 'getCiphers').returns(['rot13']);
-      assert.rejects(() => new MysteryBox(stubLogger, options));
+      sinon.stub(crypto, 'getCiphers').returns(['rot13']);
+      assert.rejects(() => new MysteryBox(options));
     });
   }); // constructor
 
@@ -236,7 +242,8 @@ describe('MysteryBox', function () {
 
   describe('pack, unpack', function () {
     beforeEach(function () {
-      mb = new MysteryBox(stubLogger, options);
+      mb = new MysteryBox(options);
+      _verbose(mb);
     });
   
     it('covers packing unsupported version', async function () {
@@ -280,8 +287,10 @@ describe('MysteryBox', function () {
 
     it('decrypts secondary (older) secret', async function () {
       this.slow(500);
-      const oldmb = new MysteryBox(stubLogger, { encryptionSecret: 'old secret' });
-      const newmb = new MysteryBox(stubLogger, { encryptionSecret: ['new secret', 'old secret'] });
+      const oldmb = new MysteryBox({ encryptionSecret: 'old secret' });
+      _verbose(oldmb);
+      const newmb = new MysteryBox({ encryptionSecret: ['new secret', 'old secret'] });
+      _verbose(newmb);
       object = {
         foo: 'bar',
         baz: 'quux',
@@ -294,8 +303,10 @@ describe('MysteryBox', function () {
 
     it('fails to decrypt invalid secret', async function () {
       this.slow(500);
-      const oldmb = new MysteryBox(stubLogger, { encryptionSecret: 'very old secret' });
-      const newmb = new MysteryBox(stubLogger, { encryptionSecret: ['new secret', 'old secret'] });
+      const oldmb = new MysteryBox({ encryptionSecret: 'very old secret' });
+      _verbose(oldmb);
+      const newmb = new MysteryBox({ encryptionSecret: ['new secret', 'old secret'] });
+      _verbose(newmb);
       object = {
         foo: 'bar',
         baz: 'quux',
@@ -305,7 +316,7 @@ describe('MysteryBox', function () {
       assert.rejects(() => newmb.unpack(oldEncrypted));
     });
 
-    it('encrypts and decrypts all available versions +brotli', async function () {
+    it('encrypts and decrypts all available versions no compression', async function () {
       Object.keys(mb.versionParameters).map((v) => Number(v)).forEach(async (version) => {
         object = {
           foo: 'bar',
@@ -318,6 +329,19 @@ describe('MysteryBox', function () {
       });
     });
 
+    it('encrypts and decrypts all available versions +brotli', async function () {
+      Object.keys(mb.versionParameters).map((v) => Number(v)).forEach(async (version) => {
+        object = {
+          foo: 'bar',
+          baz: 'quux',
+          flarp: 13,
+        };
+        const encryptedResult = await mb.pack(object, version, mb.Flags.Brotli);
+        const decryptedResult = await mb.unpack(encryptedResult);
+        assert.deepStrictEqual(decryptedResult, object, `${version} results not symmetric`);
+      });
+    });
+
     it('encrypts and decrypts all available versions +flate', async function () {
       Object.keys(mb.versionParameters).map((v) => Number(v)).forEach(async (version) => {
         object = {
@@ -325,7 +349,7 @@ describe('MysteryBox', function () {
           baz: 'quux',
           flarp: 13,
         };
-        const encryptedResult = await mb.pack(object, version, 0x01);
+        const encryptedResult = await mb.pack(object, version, mb.Flags.Flate);
         const decryptedResult = await mb.unpack(encryptedResult);
         assert.deepStrictEqual(decryptedResult, object, `${version} results not symmetric`);
       });
@@ -341,7 +365,7 @@ describe('MysteryBox', function () {
       object = {
         longProperty: 'x'.repeat(384 * 1024).split('').map(() => String.fromCharCode(rnd())).join(''),
       };
-      const encryptedResult = await mb.pack(object, mb.bestVersion, 0x00);
+      const encryptedResult = await mb.pack(object, mb.bestVersion, mb.Flags.Brotli);
       const decryptedResult = await mb.unpack(encryptedResult);
       assert.deepStrictEqual(decryptedResult, object);
     });
@@ -356,7 +380,7 @@ describe('MysteryBox', function () {
       object = {
         longProperty: 'x'.repeat(384 * 1024).split('').map(() => String.fromCharCode(rnd())).join(''),
       };
-      const encryptedResult = await mb.pack(object, mb.bestVersion, 0x01);
+      const encryptedResult = await mb.pack(object, mb.bestVersion, mb.Flags.Flate);
       const decryptedResult = await mb.unpack(encryptedResult);
       assert.deepStrictEqual(decryptedResult, object);
     });
@@ -372,12 +396,14 @@ describe('MysteryBox', function () {
     });
 
     it('covers internal error, incorrect version byte size, pack', async function () {
+      this.slow(500);
       const version = 1;
       sinon.stub(mb.versionParameters[version], 'versionBytes').value(10);
       assert.rejects(() => mb.pack({}, version), Error);
     });
 
     it('covers internal error, incorrect version byte size, unpack', async function () {
+      this.slow(500);
       const version = 1;
       const encryptedResult = await mb.pack({}, version);
       sinon.stub(mb.versionParameters[version], 'versionBytes').value(10);