tests refactoring (wip)

Author: rzcoder

src/NodeRSA.js

@@ -114,15 +114,15 @@ module.exports = (function() {
      * Check if keypair contains private key
      */
     NodeRSA.prototype.isPrivate = function() {
-        return this.keyPair.n && this.keyPair.e && this.keyPair.d;
+        return this.keyPair.n && this.keyPair.e && this.keyPair.d || false;
     };
 
     /**
      * Check if keypair contains public key
      * @param strict {boolean} - public key only, return false if have private exponent
      */
     NodeRSA.prototype.isPublic = function(strict) {
-        return this.keyPair.n && this.keyPair.e && !(strict && this.keyPair.d);
+        return this.keyPair.n && this.keyPair.e && !(strict && this.keyPair.d) || false;
     };
 
     /**
@@ -164,6 +164,10 @@ module.exports = (function() {
      * @returns {string|Buffer}
      */
     NodeRSA.prototype.sign = function(buffer, encoding, source_encoding) {
+        if (!this.isPrivate()) {
+            throw Error("isn't private key")
+        }
+
         encoding = (!encoding || encoding == 'buffer' ? null : encoding)
         var signer = crypt.createSign('RSA-SHA256');
         signer.update(this.$getDataForEcrypt(buffer, source_encoding));

test/tests.js

@@ -11,9 +11,9 @@ describe("NodeRSA", function(){
         {b: 512, e: 3},
         {b: 512, e: 5},
         {b: 512, e: 257},
-        {b: 512, e: 65537},
-        {b: 768}, // 'e' should be 65537
-        {b: 1024} // 'e' should be 65537
+        //{b: 512, e: 65537},
+        //{b: 768}, // 'e' should be 65537
+        //{b: 1024} // 'e' should be 65537
     ];
 
     var dataBundle = {
@@ -135,39 +135,64 @@ describe("NodeRSA", function(){
     });
 
     describe("Encrypting & decrypting", function(){
-        var encrypted = {};
-        var decrypted = {};
+        describe("Good cases", function () {
+            var encrypted = {};
+            var decrypted = {};
+
+            for(var i in dataBundle) {
+                var suit = dataBundle[i];
+                var key = null;
+
+                it("should encrypt "+i, function(){
+                    key = generatedKeys[Math.round(Math.random()*1000) % generatedKeys.length];
+                    encrypted[i] = key.encrypt(suit.data);
+                    assert(Buffer.isBuffer(encrypted[i]));
+                    assert(encrypted[i].length > 0);
+                });
 
-        for(var i in dataBundle) {
-            var suit = dataBundle[i];
+                it("should decrypt "+i, function(){
+                    decrypted[i] = key.decrypt(encrypted[i], _.isArray(suit.encoding) ? suit.encoding[0] : suit.encoding);
+                    assert(_.isEqual(suit.data, decrypted[i]));
+                });
+            }
+        });
+    });
 
-            it("should encrypt "+i, function(){
-                encrypted[i] = generatedKeys[0].encrypt(suit.data);
-                assert(Buffer.isBuffer(encrypted[i]));
-                assert(encrypted[i].length > 0);
-            });
+    describe("Signing & verifying", function () {
+        describe("Good cases", function () {
+            var signed = {};
+            var key = null;
+
+            for(var i in dataBundle) {
+                var suit = dataBundle[i];
+                it("should sign "+i, function(){
+                    key = generatedKeys[Math.round(Math.random()*1000) % generatedKeys.length];
+                    signed[i] = key.sign(suit.data);
+                    assert(Buffer.isBuffer(signed[i]));
+                    assert(signed[i].length > 0);
+                });
 
-            it("should decrypt "+i, function(){
-                decrypted[i] = generatedKeys[0].decrypt(encrypted[i], _.isArray(suit.encoding) ? suit.encoding[0] : suit.encoding);
-                assert(_.isEqual(suit.data, decrypted[i]));
+                it("should verify "+i, function(){
+                    assert(key.verify(suit.data, signed[i]));
+                });
+            }
+        });
+
+        describe("Bad cases", function () {
+            it("incorrect information", function(){
+                var signed = generatedKeys[0].sign('data1');
+                assert(! generatedKeys[0].verify('data2', signed));
             });
-        }
-    });
 
-    describe("Signing & verifying", function () {
-        var signed = {};
-
-        for(var i in dataBundle) {
-            var suit = dataBundle[i];
-            it("should sign "+i, function(){
-                signed[i] = generatedKeys[0].sign(suit.data);
-                assert(Buffer.isBuffer(signed[i]));
-                assert(signed[i].length > 0);
+            it("incorrect key for signing", function(){
+                var key = new NodeRSA(generatedKeys[0].getPublicPEM());
+                key.sign('data');
             });
 
-            it("should verify "+i, function(){
-                assert(generatedKeys[0].verify(suit.data, signed[i]));
+            it("incorrect key for verifying", function(){
+                var signed = generatedKeys[0].sign('data');
+                assert(! generatedKeys[1].verify('data', signed));
             });
-        }
+        });
     });
 });