102502005

calculator.js

@@ -1,15 +1,32 @@
 function isNumber(numStr){
-  var re = /^[0-9\.]+$/; 
-  return re.test(numStr);
+	var re = /^[0-9\.]+$/; 
+	return re.test(numStr);
 }
 
 function add(num1, num2){
-  return num1 + num2;
+	return num1 + num2;
 }
 
 function substract(num1, num2){
-  return num1 - num2;
+	return num1 - num2;
+}
+
+function multiply(num1, num2){
+	return num1 * num2;
+}
+
+function divide(num1, num2){
+	return num1 / num2;
+}
+
+function addARanNum(num1, RanGen){
+	var randomNum = RanGen()*100;
+	return num1 + randomNum;
 }
 
-module.exports.add = add;
 module.exports.isNumber = isNumber;
+module.exports.add = add;
+module.exports.substract = substract;
+module.exports.multiply = multiply;
+module.exports.divide = divide;
+module.exports.addARanNum = addARanNum;

index.html

@@ -22,6 +22,9 @@ <h1>Silly Calculator</h1>
     <select id="operator" size="1">
       <option value="add">+</option>
       <option value="substract">-</option>
+	  <option value="multiply">×</option>
+      <option value="divide">÷</option>
+	  <option value="addARanNum">Add a random number</option>
     </select>
     <input type="text" id="num2" value="1" />
     <div>=</div>

main.js

@@ -15,6 +15,15 @@ window.onload = function(){
     }
     else if (operator == "substract"){
       document.getElementById('ans').value = substract(num1, num2);
+    }
+	else if (operator == "multiply"){
+      document.getElementById('ans').value = multiply(num1, num2);
+    }
+	else if (operator == "divide"){
+      document.getElementById('ans').value = divide(num1, num2);
+    }
+	else if (operator == "addARanNum"){
+      document.getElementById('ans').value = addARanNum(num1, Math.random);
     }
     else {
       alert("Bad operator!")

package.json

@@ -8,7 +8,8 @@
   "author": "Askeing Yen & Shing Lyu",
   "license": "MPLv2",
   "dependencies": {
-    "mocha": "~2.3.2"
+    "mocha": "~2.3.2",
+	"sinon": "latest"
   },
   "repository":{}
 }

test/test_calculator.js

@@ -1,10 +1,50 @@
 var assert = require('assert');
+var sinon = require('sinon');
 var cal = require('../calculator.js')
 
 describe('Calculator', function(){
+
   describe('add', function(){
     it('add', function(){
       assert.equal('2', cal.add(1, 1));
     })
   })
+
+  describe('substract', function(){
+    it('substract', function(){
+      assert.equal('0', cal.substract(1, 1));
+    })
+  })
+
+  describe('multiply', function(){
+    it('multiply', function(){
+      assert.equal('2', cal.multiply(2, 1));
+    })
+  })
+
+  describe('divide', function(){
+    it('divide', function(){
+      assert.equal('2', cal.divide(2, 1));
+    })
+  })
+
+  describe('positive path test', function(){
+    it('isNumber', function(){
+      assert.equal(true, cal.isNumber(2));
+    })
+  })
+
+  describe('negative path test', function(){
+    it('isNumber', function(){
+      assert.equal(false, cal.isNumber('abcd'));
+    })
+  })
+
+  describe('test with a stub', function(){
+    it('addARanNum', function(){
+		var randomMock = sinon.stub().returns(20);
+		assert.equal(2020, cal.addARanNum(20,randomMock));
+    })
+  })
+
 })