a_mock 2.0.2 → 2.0.3

package/mock/objectMock.js

@@ -1,48 +1,61 @@
-var newMockContext = require('./mockContext');
-var newPartialMock = require('../partialMock');
-
-function collectPropertyNames(subject) {
-	var names = {};
-	for (var name in subject) {
-		names[name] = true;
-	}
-	var proto = Object.getPrototypeOf(subject);
-	while (proto && proto !== Object.prototype && proto !== Function.prototype) {
-		var props = Object.getOwnPropertyNames(proto);
-		for (var i = 0; i < props.length; i++) {
-			var prop = props[i];
-			if (prop === 'constructor' || names[prop])
-				continue;
-			var desc = Object.getOwnPropertyDescriptor(proto, prop);
-			if (desc && typeof desc.value === 'function')
-				names[prop] = true;
-		}
-		proto = Object.getPrototypeOf(proto);
-	}
-	return Object.keys(names);
-}
-
-function _new(subject,mockContext,parent) {
-	var newObjectMock = require('./objectMock');
-
-	var mockContext = newMockContext(mockContext);
-	var mock = {};
-	mock.verify = mockContext.verify;
-	if (subject instanceof Function) {
-		mock = newPartialMock(subject, parent);		
-		mockContext.verify.add(mock.verify);
-	}
-	if (!(subject instanceof Object))
-		return mock;
-	var propertyNames = collectPropertyNames(subject);
-	for(var i = 0; i < propertyNames.length; i++) {
-		var propertyName = propertyNames[i];
-		if (Object.prototype.hasOwnProperty.call(mock, propertyName))
-			continue;
-		var property = subject[propertyName];
-		mock[propertyName] = newObjectMock(property,mockContext,subject);
-	}
-	return mock;
-}
+var newMockContext = require('./mockContext');
+var newPartialMock = require('../partialMock');
+
+function collectPropertyNames(subject) {
+	var names = {};
+	for (var name in subject) {
+		names[name] = true;
+	}
+	var proto = Object.getPrototypeOf(subject);
+	while (proto && proto !== Object.prototype && proto !== Function.prototype) {
+		var props = Object.getOwnPropertyNames(proto);
+		for (var i = 0; i < props.length; i++) {
+			var prop = props[i];
+			if (prop === 'constructor' || names[prop])
+				continue;
+			var desc = Object.getOwnPropertyDescriptor(proto, prop);
+			if (desc && typeof desc.value === 'function')
+				names[prop] = true;
+		}
+		proto = Object.getPrototypeOf(proto);
+	}
+	return Object.keys(names);
+}
+
+function _new(subject,mockContext,parent) {
+	var newObjectMock = require('./objectMock');
+
+	var mockContext = newMockContext(mockContext);
+	var mock = {};
+	if (subject && typeof subject === 'function' && typeof subject.expectAnything === 'function' && typeof subject.expect === 'function')
+		return subject;
+	var mockedMap = mockContext._mockedMap;
+	if (!mockedMap) {
+		mockedMap = new WeakMap();
+		mockContext._mockedMap = mockedMap;
+	}
+	if (subject && (typeof subject === 'object' || typeof subject === 'function')) {
+		var existingMock = mockedMap.get(subject);
+		if (existingMock)
+			return existingMock;
+	}
+	mock.verify = mockContext.verify;
+	if (subject instanceof Function) {
+		mock = newPartialMock(subject, parent);		
+		mockContext.verify.add(mock.verify);
+	}
+	if (!(subject instanceof Object))
+		return mock;
+	mockedMap.set(subject, mock);
+	var propertyNames = collectPropertyNames(subject);
+	for(var i = 0; i < propertyNames.length; i++) {
+		var propertyName = propertyNames[i];
+		if (Object.prototype.hasOwnProperty.call(mock, propertyName))
+			continue;
+		var property = subject[propertyName];
+		mock[propertyName] = newObjectMock(property,mockContext,subject);
+	}
+	return mock;
+}
 
 module.exports  = _new

package/mock/objectMockSpec/test.js

@@ -1,17 +1,15 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var newRequireMock = require('../../partialMock/simple/newRequireMock');
 var newMock = require('../../partialMock/simple/newMock');
 
 (function(){
-	console.log('objectMock');
 	var newMockContext = newRequireMock('./mockContext');
 	var newPartialMock = newRequireMock('../partialMock');
 	var newSut =  require('../objectMock');
 	
 
 	(function() {
-		console.log('subject is object.new');
 		var newObjectMock = newRequireMock('./objectMock');
 		var initialMockContext = {}
 		var mockContext = {};
@@ -26,9 +24,11 @@ var newMock = require('../../partialMock/simple/newMock');
 		var bMock = {};
 
 		newMockContext.expect(initialMockContext).return(mockContext);
-		newObjectMock.expect(a).expect(mockContext).return(aMock);
-		newObjectMock.expect(b).expect(mockContext).return(bMock);
+		// parent is optional metadata; behavior should not require callers to pass it.
+		newObjectMock.expect(a).expect(mockContext).expect(subject).return(aMock);
+		newObjectMock.expect(b).expect(mockContext).expect(subject).return(bMock);
 
+		//todo
 		var returned = newSut(subject,initialMockContext);
 
 		test('it should not return subject', function(){
@@ -49,7 +49,6 @@ var newMock = require('../../partialMock/simple/newMock');
 	})();
 
 	(function() {
-		console.log('subject is func.new');
 		var newObjectMock = newRequireMock('./objectMock');
 		var initialMockContext = {}
 		var mockContext = {};
@@ -69,9 +68,10 @@ var newMock = require('../../partialMock/simple/newMock');
 		var didAddVerifyToComposite;
 
 		newMockContext.expect(initialMockContext).return(mockContext);
-		newObjectMock.expect(a).expect(mockContext).return(aMock);
-		newObjectMock.expect(b).expect(mockContext).return(bMock);
-		newPartialMock.expect(subject).return(partialMock);
+		// parent is optional metadata; behavior should not require callers to pass it.
+		newObjectMock.expect(a).expect(mockContext).expect(subject).return(aMock);
+		newObjectMock.expect(b).expect(mockContext).expect(subject).return(bMock);
+		newPartialMock.expect(subject).expectAnything().return(partialMock);
 		compositeVerify.add.expect(verify).whenCalled(onAddVerify).return(null);
 
 		function onAddVerify() {
@@ -99,7 +99,6 @@ var newMock = require('../../partialMock/simple/newMock');
 	})();
 
 	(function() {
-		console.log('subject is primitive');
 		var newObjectMock = newRequireMock('./objectMock');
 		var initialMockContext = {}
 		var mockContext = {};
@@ -120,4 +119,4 @@ var newMock = require('../../partialMock/simple/newMock');
 	    	assert.equal(returned.verify,verify);
 	    });
 	})();
-})();
+})();

package/mock/propertyMockSpec/test.js

@@ -1,9 +1,8 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var newMock = require('../../partialMock/simple/newMock');
 
 (function(){
-	console.log('propertyMock.new');
 	newSut = require('../propertyMock');
 
 	var subject = {};
@@ -22,7 +21,6 @@ var newMock = require('../../partialMock/simple/newMock');
 	});
 
 	(function() {
-		console.log('execute mocked property');
 		var mockedValue = {};
 		var arg = {};
 		mock.expect(arg).return(mockedValue);
@@ -33,4 +31,4 @@ var newMock = require('../../partialMock/simple/newMock');
 		});
 	})();
 	
-})();
+})();

package/mock/throwUnexpectedArgumentsSpec/test.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var arg1 = 'a';
 var arg2 = {};
 var arg3 = 'c';
@@ -8,7 +8,6 @@ var thrownErrorMsg;
 var thrownName;
 
 (function(){
-	console.log('throwUnexpectedArguments');
 	var sut = require('../throwUnexpectedArguments');	
 	try	{
 		sut(arg1,arg2,arg3);
@@ -32,4 +31,4 @@ var thrownName;
     });
 
 
-})();
+})();

package/mock.js

@@ -3,14 +3,14 @@ var newObjectMock = require('./mock/objectMock');
 var newPartialMock = require('./partialMock')
 var mockFuncProperties = require('./mock/mockFuncProperties')
 
-function create(subject) {
-	if (subject == undefined)
-		return newStrictMock();
-	var mock = newObjectMock(subject);
-	mockFuncProperties(subject,mock);
-	return mock;
-
-}
+function create(subject) {
+	if (subject == undefined)
+		return newStrictMock();
+	var mock = newObjectMock(subject);
+	mockFuncProperties(subject,mock);
+	return mock;
+
+}
 
 module.exports  = create;
 

package/mockSpec/test.js

@@ -1,9 +1,8 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var newRequireMock = require('../partialMock/simple/newRequireMock');
 
 (function(){
-	console.log('mock');
 	var newStrictMock = newRequireMock('./strictMock');
 	var newObjectMock = newRequireMock('./mock/objectMock');
 	var mockFuncProperties = newRequireMock('./mock/mockFuncProperties');
@@ -11,7 +10,6 @@ var newRequireMock = require('../partialMock/simple/newRequireMock');
 	var sut = require('../mock');		
 
 	(function() {
-		console.log('object input.new');
 		var input = {};
 		var objectMock = {};
 		var didMockFuncProperties;
@@ -36,7 +34,6 @@ var newRequireMock = require('../partialMock/simple/newRequireMock');
 	})();
 
 	(function() {
-		console.log('func input.new');
 		var expected = {};
 		var input = function() {};
 		newPartialMock.expect(input).return(expected);
@@ -50,7 +47,6 @@ var newRequireMock = require('../partialMock/simple/newRequireMock');
 	});
 
 	(function() {
-		console.log('empty input new');
 		var expected = {};
 	
 		newStrictMock.expect().return(expected);

package/mockSpec/testIntegration.js

@@ -1,15 +1,13 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var mock = require('../mock');
 
 (function clearCache() {
 	Object.keys(require.cache).forEach(function(key) { delete require.cache[key]; });
 })();
 
-console.log('mock');
 
 (function(){
-	console.log('an object');
 	var realName = 'Alfonzo';
 	function newCustomer() {
 
@@ -50,7 +48,6 @@ console.log('mock');
 
 
 (function foo(){
-	console.log('violating function throws with minium stack trace');
 
 	var sut = mock();
 	var lines;
@@ -75,7 +72,6 @@ console.log('mock');
 })();
 
 (function bar(){
-	console.log('violating function throws with minium stack trace given two expectations');
 
 	var sut = mock();
 	var lines;

package/newMutableAndSpec/test.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var newRequireMock = require('../partialMock/simple/newRequireMock');
 var newMock = require('../partialMock/simple/newMock');
 
@@ -7,11 +7,9 @@ var and = newRequireMock('./and');
 var newSut = require('../newMutableAnd');
 
 (function(){
-	console.log('mutableAnd');
 	var sut = newSut();
 
 	(function() {
-		console.log('execute');
 		var arg = {};
 		var expected = {};
 		and.expect(arg).return(expected);
@@ -24,7 +22,6 @@ var newSut = require('../newMutableAnd');
 	})();
 
 	(function() {
-		console.log('add');
 		var predicate = {};
 		var add = newMock();			
 		var and2 = newMock();
@@ -33,7 +30,6 @@ var newSut = require('../newMutableAnd');
 		sut.add(predicate);
 
 		(function() {
-			console.log('execute');
 			var arg = {};
 			var expected = {};
 			and2.expect(arg).return(expected);

package/newThenSpec/testExecute.js

@@ -1,9 +1,8 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var mock = require('../partialMock/simple/newMock');
 
 (function() {
-	console.log('execute with no args');
 
     var isResolved;
 
@@ -22,7 +21,6 @@ var mock = require('../partialMock/simple/newMock');
 
 
 (function() {
-	console.log('execute with 1 arg');
 
     var returned;
     var valueToResolveWith = {};
@@ -41,7 +39,6 @@ var mock = require('../partialMock/simple/newMock');
 })();
 
 (function() {
-	console.log('execute with 2 args');
 
     var returned;
     var valueToResolveWith = {};
@@ -61,7 +58,6 @@ var mock = require('../partialMock/simple/newMock');
 })();
 
 (function() {
-	console.log('execute with 2 args given first one is falsy');
 
     var returned;
     var errorToRejectWith = {};

package/newThenSpec/testNoCallback.js

@@ -1,9 +1,8 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var mock = require('../partialMock/simple/newMock');
 
 (function() {
-	console.log('resove value can be carried through a long chain');
 
 	var expected = {};
 	var actual;
@@ -27,7 +26,6 @@ var mock = require('../partialMock/simple/newMock');
 
 
 (function() {
-	console.log('reject value can be carried through a long chain');
 
 	var expected = {};
 	var actual;

package/newThenSpec/testPreReject.js

@@ -1,14 +1,14 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var mock = require('../partialMock/simple/newMock');
 
 (function() {
-    console.log('then pre reject');
 
     var expected = {};
     var expected2 = {};
     var actual;
     var actual2;
+    var actualRepeated;
     var expectedRepeated = {};
     var actualRepeated2;
 

package/newThenSpec/testPreRejectAndThrow.js

@@ -1,14 +1,14 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var mock = require('../partialMock/simple/newMock');
 
 (function() {
-    console.log('then throws for preRejected');
 
     var expected = {};
     var expected2 = {};
     var actual;
     var actual2;
+    var actualRepeated;
     var expectedRepeated = {};
     var actualRepeated2;
 

package/newThenSpec/testPreResolve.js

@@ -1,9 +1,8 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var mock = require('../partialMock/simple/newMock');
 
 (function() {
-    console.log('then pre resolve');
 
     var expected = {};
     var expected2 = {};

package/newThenSpec/testPreResolveAndThrow.js

@@ -1,14 +1,14 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var mock = require('../partialMock/simple/newMock');
 
 (function() {
-    console.log('then throws for preResolved');
 
     var expected = {};
     var expected2 = {};
     var actual;
     var actual2;
+    var actualRepeated;
     var expectedRepeated = {};
     var actualRepeated2;
 

package/newThenSpec/testReject.js

@@ -1,14 +1,14 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var mock = require('../partialMock/simple/newMock');
 
 (function() {
-    console.log('then reject');
 
     var expected = {};
     var expected2 = {};
     var actual;
     var actual2;
+    var actualRepeated;
     var expectedRepeated = {};
     var actualRepeated2;
 

package/newThenSpec/testRejectAndThrow.js

@@ -1,14 +1,14 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var mock = require('../partialMock/simple/newMock');
 
 (function() {
-	console.log('then throws');
 
 	var expected = {};
 	var expected2 = {};
 	var actual;
 	var actual2;
+	var actualRepeated;
 	var expectedRepeated = {};
 	var actualRepeated2;
 

package/newThenSpec/testResolve.js

@@ -1,9 +1,8 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var mock = require('../partialMock/simple/newMock');
 
 (function() {
-	console.log('then resolve');
 
 	var expected = {};
 	var expected2 = {};

package/newThenSpec/testResolveAndThrow.js

@@ -1,14 +1,14 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var mock = require('../partialMock/simple/newMock');
 
 (function() {
-	console.log('then throws for resolved');
 
 	var expected = {};
 	var expected2 = {};
 	var actual;
 	var actual2;
+	var actualRepeated;
 	var expectedRepeated = {};
 	var actualRepeated2;
 

package/newThenSpec/testResolveWithFailingPromise.js

@@ -1,9 +1,8 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var mock = require('../partialMock/simple/newMock');
 
 (function() {
-	console.log('then resolve with a rejected promise');
 
 	var expected = {};
 	var expected2 = {};

package/newThenSpec/testResolveWithPromise.js

@@ -1,9 +1,8 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var mock = require('../partialMock/simple/newMock');
 
 (function() {
-	console.log('then resolve with a promise');
 
 	var expected = {};
 	var expected2 = {};

package/newTrueNTimesThenFalseSpec/test.js

@@ -1,17 +1,14 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var newSut = require('../newTrueNTimesThenFalse');
 
 (function(){
-	console.log('newTrueNTimesThenFalse');
 	
 	(function() {
-		console.log('two times');
 		var times = 2;
 		var sut = newSut(times);
 
 		(function(){
-			console.log('execute three times');
 			var returned = sut();
 			var returned2 = sut();
 			var returned3 = sut();
@@ -33,11 +30,9 @@ var newSut = require('../newTrueNTimesThenFalse');
 	})();
 
 	(function() {
-		console.log('undefined times');
 		var sut = newSut();		
 		
 		(function(){
-			console.log('execute n times');
 			var returned = sut();
 			var returned2 = sut();
 			var returned3 = sut();

package/newTrueOnceThenFalseSpec/test.js

@@ -1,13 +1,11 @@
 var assert = require('assert');
-var test = require('../test');
+var test = require('node:test');
 var newSut = require('../newTrueOnceThenFalse');
 
 (function(){
-	console.log('newTrueOnceThenFalse');
 	var sut = newSut();
 
 	(function() {
-		console.log('execute');
 		var returned = sut();
 		
 		test('it should return true',function() {
@@ -15,7 +13,6 @@ var newSut = require('../newTrueOnceThenFalse');
 		});
 
 		(function() {
-			console.log('execute');
 			var returned = sut();
 			test('it should return false',function() {
 				assert.equal(false,returned);

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "a_mock",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "main": "index.js",
   "types": "index.d.ts",
   "title": "a_mock",
   "description": "Sub package of a. Mocking framework",
   "keywords": ["mock","mocking","partial mock","strict mock","tdd","stub","stubbing","mock require","verify"],
+  "scripts": {
+    "test": "node --test **/*Spec/test*.js"
+    
+  },
   "dependencies": {  },
   "repository" : {
     "type" : "git",

package/partialMock/execute.js

@@ -7,14 +7,14 @@ function execute(returnValue,fallback,hasCorrectArguments,mockContext,shouldDecr
 		args.push(arguments[index]);
 		index++;
 	}
-	if (hasCorrectArguments.apply(null,args)) {
-		negotiateDecrementExpectCount(shouldDecrementExpectCount,mockContext);
-		whenCalledEmitter.emit.apply(null,args);
-		return returnValue;
-	}
-		
-	var receiver = mockContext && mockContext.thisArg != null ? mockContext.thisArg : this;
-	return fallback.apply(receiver,args);
-}
+	if (hasCorrectArguments.apply(null,args)) {
+		negotiateDecrementExpectCount(shouldDecrementExpectCount,mockContext);
+		whenCalledEmitter.emit.apply(null,args);
+		return returnValue;
+	}
+		
+	var receiver = mockContext && mockContext.thisArg != null ? mockContext.thisArg : this;
+	return fallback.apply(receiver,args);
+}
 
-module.exports = execute;
+module.exports = execute;