Add more tests

Author: dchest

scrypt-async.js

@@ -377,7 +377,7 @@ function scrypt(password, salt, logN, r, dkLen, interruptStep, callback, encodin
         if (opts.N < 2 || opts.N > MAX_UINT)
           throw new Error('scrypt: N is out of range');
 
-        if (opts.N & (opts.N - 1) !== 0)
+        if ((opts.N & (opts.N - 1)) !== 0)
           throw new Error('scrypt: N is not a power of 2');
 
         logN = Math.log(opts.N) / Math.LN2;

test/unittests.js

@@ -294,6 +294,24 @@ describe('limits test', function() {
     }, Error);
   });
 
+  it('should throw with too big N', function() {
+    assert.throws(function() {
+      scrypt(v.password, v.salt, { N: ((-1)>>>0) + 1, r: v.r, dkLen: v.dkLen });
+    }, Error);
+  });
+
+  it('should throw with too small N', function() {
+    assert.throws(function() {
+      scrypt(v.password, v.salt, { N: 1, r: v.r, dkLen: v.dkLen });
+    }, Error);
+  });
+
+  it('should throw when N is not power of two', function() {
+    assert.throws(function() {
+      scrypt(v.password, v.salt, { N: 123, r: v.r, dkLen: v.dkLen });
+    }, Error);
+  });
+
   it('should throw with too large parameters', function() {
     assert.throws(function() {
       scrypt(v.password, v.salt, v.logN, 1<<31, v.dkLen);
@@ -306,6 +324,12 @@ describe('limits test', function() {
     }, Error);
   });
 
+  it('should throw when p = 0', function() {
+    assert.throws(function() {
+      scrypt(v.password, v.salt, { logN: v.logN, r: v.r, p: 0, dkLen: v.dkLen});
+    }, Error);
+  });
+
 });
 
 describe('argument order test', function() {
@@ -341,6 +365,25 @@ describe('argument order test', function() {
     }, 'hex');
   });
 
+});
+
+describe('options test', function() {
+  var v = shortInput;
+
+  it('should throw when given too many arguments', function() {
+    assert.throws(function() {
+      scrypt(v.password, v.salt, { logN: v.logN, r: 1, dkLen: v.dkLen }, 666, function(){});
+    }, Error);
+  });
+
+  it('should throw when there is no N or logN', function() {
+    assert.throws(function() {
+      scrypt(v.password, v.salt, { r: 1, dkLen: v.dkLen });
+    }, Error);
+  });
+
+
+
 });
 
 describe('encoding test', function() {