a_mock 2.0.2 → 2.0.4

package/partialMock/newFallbackWrapper.js

@@ -1,35 +1,35 @@
-var getStackTrace = require('./fallbackWrapper/getStackTrace');
-
-function _new(originalFallback, thisArg) {
-
-	var fallback = originalFallback;
-	var fallbackThis = thisArg;
-
-	function execute() {
-		Error.stackTraceLimit = Error.stackTraceLimit + 2;
-		try {
-			var receiver = fallbackThis != null ? fallbackThis : this;
-			return fallback.apply(receiver,arguments);	
-		}
-		catch (e) {			
-			if (e.name == 'Mock Error') {
-  				e.stack = e.name + ': ' + e.message + '\n' + getStackTrace();
-			}
+var getStackTrace = require('./fallbackWrapper/getStackTrace');
+
+function _new(originalFallback, thisArg) {
+
+	var fallback = originalFallback;
+	var fallbackThis = thisArg;
+
+	function execute() {
+		Error.stackTraceLimit = Error.stackTraceLimit + 2;
+		try {
+			var receiver = fallbackThis != null ? fallbackThis : this;
+			return fallback.apply(receiver,arguments);	
+		}
+		catch (e) {			
+			if (e.name == 'Mock Error') {
+  				e.stack = e.name + ': ' + e.message + '\n' + getStackTrace();
+			}
 			throw e;
 		}
 		finally {
 			Error.stackTraceLimit = Error.stackTraceLimit - 2;
 		}
-
-	}
-
-	execute.setFallback = function(fallback2, thisArg2) {
-		fallback = fallback2;
-		if (arguments.length > 1)
-			fallbackThis = thisArg2;
-	};
-
-	return execute;
-}
 
-module.exports = _new;
+	}
+
+	execute.setFallback = function(fallback2, thisArg2) {
+		fallback = fallback2;
+		if (arguments.length > 1)
+			fallbackThis = thisArg2;
+	};
+
+	return execute;
+}
+
+module.exports = _new;

package/partialMock/newFallbackWrapperSpec/test.js

@@ -1,12 +1,11 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var newMock = require('../simple/newMock');
 var newRequireMock = require('../simple/newRequireMock');
 var getStackTrace = newRequireMock('./fallbackWrapper/getStackTrace');
 var newSut = require('../newFallbackWrapper');
 
 (function() {
-	console.log('newFallbackWrapper');
 	
 	var originalFallback = newMock();
 	var sut = newSut(originalFallback);
@@ -14,7 +13,6 @@ var newSut = require('../newFallbackWrapper');
 	var originalStackTraceLimit = Error.stackTraceLimit;
 
 	(function() {
-		console.log('execute');
 		var arg = {};		
 		var expected = {};
 			
@@ -35,12 +33,10 @@ var newSut = require('../newFallbackWrapper');
 
 
 		(function() {
-			console.log('setFallback');
 			var fallback = newMock();			
 			sut.setFallback(fallback);
 
 			(function() {
-				console.log('execute');
 				didIncrementStackTrace = false;
 				var expected = {};
 				fallback.expect(arg).whenCalled(onFallback).return(expected);
@@ -67,4 +63,4 @@ var newSut = require('../newFallbackWrapper');
 	}
 
 
-})();
+})();

package/partialMock/newFallbackWrapperSpec/testWithMockError.js

@@ -1,12 +1,11 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var newMock = require('../simple/newMock');
 var newRequireMock = require('../simple/newRequireMock');
 var getStackTrace = newRequireMock('./fallbackWrapper/getStackTrace');
 var newSut = require('../newFallbackWrapper');
 
 (function() {
-	console.log('newFallbackWrapper');	
 	var sut = newSut(originalFallback);
 	var didIncrementStackTrace
 	var originalStackTraceLimit = Error.stackTraceLimit;
@@ -20,7 +19,6 @@ var newSut = require('../newFallbackWrapper');
 	}
 
 	(function() {
-		console.log('execute with mock error');
 		var arg = {};				
 		var error;
 		var stackTrace = 'stackTrace';
@@ -56,4 +54,4 @@ var newSut = require('../newFallbackWrapper');
 			assert.equal(Error.stackTraceLimit,originalStackTraceLimit);
 		});
 	})();
-})();
+})();

package/partialMock/newFallbackWrapperSpec/testWithOtherError.js

@@ -1,12 +1,11 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var newMock = require('../simple/newMock');
 var newRequireMock = require('../simple/newRequireMock');
 var getStackTrace = newRequireMock('./fallbackWrapper/getStackTrace');
 var newSut = require('../newFallbackWrapper');
 
 (function() {
-	console.log('newFallbackWrapper');	
 	var sut = newSut(originalFallback);
 	var didIncrementStackTrace
 	var originalStackTraceLimit = Error.stackTraceLimit;
@@ -21,7 +20,6 @@ var newSut = require('../newFallbackWrapper');
 	}
 
 	(function() {
-		console.log('execute with mock error');
 		var arg = {};				
 		var error;		
 			
@@ -29,7 +27,6 @@ var newSut = require('../newFallbackWrapper');
 			sut(arg);
 		}
 		catch(e) {
-			console.log('foo: ' + e.stack);
 			error = e;
 		}		
 
@@ -45,4 +42,4 @@ var newSut = require('../newFallbackWrapper');
 			assert.equal(Error.stackTraceLimit,originalStackTraceLimit);
 		});
 	})();
-})();
+})();

package/partialMock/newHasArgumentSpec/test.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var newMock = require('../simple/newMock');
 var newRequireMock = require('../simple/newRequireMock');
 
@@ -7,13 +7,11 @@ var newSut = require('../newHasArgument');
 
 
 (function() {
-	console.log('newHasArgument');
 	var index = 1;
 	
 	var sut = newSut(index);
 
 	(function() {
-		console.log('no arg.execute');
 		var returned = sut('a');
 
 		test('it should return false',function() {
@@ -24,7 +22,6 @@ var newSut = require('../newHasArgument');
 
 
 	(function() {
-		console.log('correct argument.execute');
 		var returned = sut('a','b');
 
 		test('it should return true',function() {
@@ -33,4 +30,4 @@ var newSut = require('../newHasArgument');
 
 	})();
 
-})();
+})();

package/partialMock/newHasEqualArgumentArraySpec/test.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var newMock = require('../simple/newMock');
 var newRequireMock = require('../simple/newRequireMock');
 
@@ -7,7 +7,6 @@ var newSut = require('../newHasEqualArgumentArray');
 
 
 (function() {
-	console.log('newHasEqualArgumentArray');
 	var expectedElement1 = {};
 	var expectedElement2 = {};
 	var expectedArg = [expectedElement1,expectedElement2];
@@ -16,7 +15,6 @@ var newSut = require('../newHasEqualArgumentArray');
 	var sut = newSut(expectedArg,index);
 
 	(function() {
-		console.log('too few arguments.execute');
 		var returned = sut('arg');
 
 		test('it should return false',function() {
@@ -26,7 +24,6 @@ var newSut = require('../newHasEqualArgumentArray');
 	})();
 
 	(function() {
-		console.log('incorrect argument.execute');
 		var returned = sut('arg',[expectedElement1,'wrongElement']);
 
 		test('it should return false',function() {
@@ -36,7 +33,6 @@ var newSut = require('../newHasEqualArgumentArray');
 	})();
 
 	(function() {
-		console.log('incorrect arrayLength.execute');
 		var returned = sut('arg',[expectedElement1,expectedElement2,'off-by-one']);
 
 		test('it should return false',function() {
@@ -47,7 +43,6 @@ var newSut = require('../newHasEqualArgumentArray');
 
 
 	(function() {
-		console.log('correct argument.execute');
 		var returned = sut('arg',[expectedElement1,expectedElement2]);
 
 		test('it should return true',function() {
@@ -56,4 +51,4 @@ var newSut = require('../newHasEqualArgumentArray');
 
 	})();
 	
-})();
+})();

package/partialMock/newHasNoMoreArgumentsSpec/test.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var newMock = require('../simple/newMock');
 var newRequireMock = require('../simple/newRequireMock');
 
@@ -7,13 +7,11 @@ var newSut = require('../newHasNoMoreArguments');
 
 
 (function() {
-    console.log('newHasNoMoreArguments');
     var length = 1;
     var mockContext = {};
 
 
     (function() {
-        console.log('two arguments too much.execute');
         mockContext.expectAnything = true;
         var sut = newSut(length, mockContext);
         var returned = sut('somearg', 'c', 'd');
@@ -25,7 +23,6 @@ var newSut = require('../newHasNoMoreArguments');
     })();
 
     (function() {
-        console.log('two arguments too much, but expectAnything.execute');
         mockContext.expectAnything = false;
         var sut = newSut(length, mockContext);
 
@@ -38,7 +35,6 @@ var newSut = require('../newHasNoMoreArguments');
     })();
 
     (function() {
-        console.log('one argument too much.execute');
         mockContext.expectAnything = false;
         var sut = newSut(length, mockContext);
 
@@ -51,7 +47,6 @@ var newSut = require('../newHasNoMoreArguments');
     })();
 
     (function() {
-        console.log('correct number of arguments.execute');
         mockContext.expectAnything = false;
         var sut = newSut(length, mockContext);
 
@@ -61,4 +56,4 @@ var newSut = require('../newHasNoMoreArguments');
             assert.equal(true, returned);
         });
     })();
-})();
+})();

package/partialMock/newHasSameArgumentSpec/test.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var newMock = require('../simple/newMock');
 var newRequireMock = require('../simple/newRequireMock');
 var isEqualArg = newRequireMock('./hasSameArgument/isEqualArg');
@@ -7,14 +7,12 @@ var newSut = require('../newHasSameArgument');
 
 
 (function() {
-	console.log('newHasSameArgument');
 	var expectedArg = {};
 	var index = 1;
 	
 	var sut = newSut(expectedArg,index);
 
 	(function() {
-		console.log('too few arguments.execute');
 		var arg = {};
 		var returned = sut(arg);
 
@@ -25,7 +23,6 @@ var newSut = require('../newHasSameArgument');
 	})();
 
 	(function() {
-		console.log('incorrect argument.execute');
 		var arg = {};
 		isEqualArg.expect(expectedArg).expect(arg).return(false);
 		var returned = sut('arg',arg);
@@ -37,7 +34,6 @@ var newSut = require('../newHasSameArgument');
 	})();
 
 	(function() {
-		console.log('correct argument.execute');
 		var arg = {};
 		isEqualArg.expect(expectedArg).expect(arg).return(true);
 
@@ -53,12 +49,10 @@ var newSut = require('../newHasSameArgument');
 		var obj;
 		obj = [];
 		for (var property in obj  ) {
-			console.log(property);
 		};
 
 		obj = {foo: 'hei'};
 		for (var property in obj  ) {
-			console.log(property);
 		};
 
 
@@ -66,15 +60,13 @@ var newSut = require('../newHasSameArgument');
 			this.gag = 'gag';
 			this.baz = {};
 		}
-		Foo.prototype.bar = function(){ console.log('hello ' + this.gag);};
 
 		obj = new Foo();
 		obj2 = new Foo();
 		for (var property in obj  ) {
-			console.log(property);
 		};
 		obj.bar();
 		assert.equal(obj.baz,obj2.baz);
 */
 
-})();
+})();

package/partialMock/newMockContext.js

@@ -1,13 +1,13 @@
-var newObject = require('../newObject')
-var reset = require('./mockContext/reset');
-
-function _new(originalFallback, thisArg) {
-	var c = newObject();
-	c = reset(c,originalFallback,thisArg);
-	c.reset = function() {
-		return reset(c, originalFallback, thisArg);
-	};
-	return c;	
-}
+var newObject = require('../newObject')
+var reset = require('./mockContext/reset');
 
-module.exports = _new;
+function _new(originalFallback, thisArg) {
+	var c = newObject();
+	c = reset(c,originalFallback,thisArg);
+	c.reset = function() {
+		return reset(c, originalFallback, thisArg);
+	};
+	return c;	
+}
+
+module.exports = _new;

package/partialMock/newMockContextSpec/test.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var newMock = require('../simple/newMock');
 var newRequireMock = require('../simple/newRequireMock');
 
@@ -9,7 +9,6 @@ var reset = newRequireMock('./mockContext/reset');
 var newSut = require('../newMockContext');
 
 (function() {
-	console.log('newMockContext');
 	var originalFallback = {};
 	var didReset;
 	var object = {};
@@ -17,7 +16,8 @@ var newSut = require('../newMockContext');
 	var resetResult = {};
 
 	newObject.expect().return(object);
-	reset.expect(object).expect(originalFallback).return(context);
+	// thisArg is optional and should not be required by callers.
+	reset.expect(object).expect(originalFallback).expectAnything().return(context);
 	var sut = newSut(originalFallback);
 
 
@@ -25,12 +25,12 @@ var newSut = require('../newMockContext');
 		assert.equal(sut, context);
 	});
 
-	console.log('reset');
-	reset.expect(context).expect(originalFallback).return(resetResult);
+	// thisArg is optional and should not be required by callers.
+	reset.expect(context).expect(originalFallback).expectAnything().return(resetResult);
 	returned = sut.reset();
 
 	test('forwards to reset',function() {
 		assert.equal(returned, resetResult);
 	});
 	
-})();
+})();

package/partialMock/newThrowSpec/test.js

@@ -1,10 +1,9 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var sut = require('../newThrow');
 var error = {};
 
 (function(){
-	console.log('newThrow');
 	var thrown;
 	try	{
 		var _throw = sut(error);
@@ -17,4 +16,4 @@ var error = {};
 	test('it should throw error',function() {
 		assert.equal(thrown,error); 
 	});
-})();
+})();

package/partialMock/returnSpec/test.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var newMock = require('../simple/newMock');
 var newRequireMock = require('../simple/newRequireMock');
 
@@ -9,7 +9,6 @@ var newHasNoMoreArguments = newRequireMock('./newHasNoMoreArguments');
 var sut = require('../return');
 
 (function(){
-	console.log('return');
 	var mockContext = {};
 	var hasNoMoreArguments = {};
 	var returnValue = 'returnValue';
@@ -56,7 +55,6 @@ var sut = require('../return');
 	});
 
 	(function() {
-		console.log('repeat');
 		var didSetExecute;
 		var expected = {};
 		var times = 2;		
@@ -80,7 +78,6 @@ var sut = require('../return');
 
 
 	(function() {
-		console.log('repeatAny');
 		var didSetExecute;
 		var expected = {};
 		setExecute.expect(returnValue).expect(compositeAreCorrectArguments).expect(mockContext).whenCalled(onSetExecuteNTimes).return(null);
@@ -103,4 +100,4 @@ var sut = require('../return');
 
 
 
-})();
+})();

package/partialMock/setExecuteSpec/test.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var newMock = require('../simple/newMock');
 var newRequireMock = require('../simple/newRequireMock');
 
@@ -11,7 +11,6 @@ var negotiateIncrementExpectCount = newRequireMock('./negotiateIncrementExpectCo
 var sut = require('../setExecute');
 
 (function(){
-	console.log('setExecute');
 	var mockContext = {};
 	var returnValue = {};
 	var hasCorrectArguments = {};
@@ -84,4 +83,4 @@ var sut = require('../setExecute');
 		assert.ok(didNegotiateIncrementExpectCount);
 	});
 
-})();
+})();

package/partialMock/simple/expectRequireSpec/test.js

@@ -1,16 +1,14 @@
 var sut = require('../expectRequire');
 var assert = require('assert');
-var test = require('../../../test');
+var test = require('node:test');
 
 var fooFake = {};
 var bazFake = {};
 	
 
 (function(){
-	console.log('expectRequire');
 
 	(function() {		
-		console.log('require');
 		sut('./foo').return(fooFake);
 		sut('./baz').return(bazFake);
 
@@ -38,4 +36,4 @@ var bazFake = {};
     	});
 
 	})();	
-})();
+})();

package/partialMock/simple/newMock/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';
@@ -7,17 +7,16 @@ var errorMsg = "Unexpected arguments: a [object Object] c."
 var thrownErrorMsg;
 
 (function(){
-	console.log('throwUnexpectedArguments');
 	var sut = require('../throwUnexpectedArguments');
 	try	{
 		sut(arg1,arg2,arg3);
 	}
 	catch(error) {
-		thrownErrorMsg = error;
+		thrownErrorMsg = error && error.message;
 	}
 
 	test('it should throw correct msg', function(){
 		assert.equal(errorMsg,thrownErrorMsg);
     });
 
-})();
+})();

package/partialMock/simple/newMockSpec/test.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var test = require('../../../test');
+var test = require('node:test');
 var expectRequire = require('../expectRequire');
 var newMockCore = require('../newPartialMock');
 
@@ -16,7 +16,6 @@ expectRequire('./newPartialMock').return(newPartialMock);
 expectRequire('./newMock/throwUnexpectedArguments').return(throwUnexpectedArguments);
 
 (function(){
-	console.log('newMock');
 	var partialMock = {};
 	newPartialMock.expect(throwUnexpectedArguments).return(partialMock);
 	var returned = require('../newMock')();
@@ -25,4 +24,4 @@ expectRequire('./newMock/throwUnexpectedArguments').return(throwUnexpectedArgume
 		assert.equal(partialMock,returned);
     });
 
-})();
+})();

package/partialMock/simple/newPartialMock.js

@@ -77,6 +77,8 @@ function create(originalFunc) {
 		return mock;
 	}
 
+	mock.ignoreAll = mock.expectAnything;
+
 	function verifyAnyArgument(arg) 
 	{
 		return true;

package/partialMock/simple/newPartialMockSpec/test.js

@@ -1,6 +1,6 @@
 var newSut = require('../newPartialMock');
 var assert = require('assert');
-var test = require('../../../test');
+var test = require('node:test');
 
 		var originalReturnValue = {orig:''};
 		function original() {
@@ -12,10 +12,8 @@ var test = require('../../../test');
 
 
 (function(){
-	console.log('partialMockSpec');
 
 	(function() {		
-		console.log('expect return foo once');
 		
 		var sut = newSut(original);
 
@@ -40,7 +38,6 @@ var test = require('../../../test');
 	})();
 
 	(function() {		
-		console.log('expect return foo twice');		
 		var sut = newSut(original);
 		sut.expect().return(foo);
 		sut.expect().return(foo);
@@ -64,7 +61,6 @@ var test = require('../../../test');
 	})();
 
 	(function() {		
-		console.log('expect return after reset');		
 		var sut = newSut(original);
 		sut.expect().return(foo);
 		sut.expect().return(foo);
@@ -90,7 +86,6 @@ var test = require('../../../test');
 	})();
 
 	(function() {		
-		console.log('expect return foo then baz');		
 		var sut = newSut(original);
 		sut.expect().return(foo);
 		sut.expect().return(baz);
@@ -114,7 +109,6 @@ var test = require('../../../test');
 	})();
 
 	(function() {		
-		console.log('expect return when argument is undefined.');	
 		var sut = newSut(original);
 		var arg = {};
 		var someUndefined;
@@ -138,4 +132,4 @@ var test = require('../../../test');
     	});
 
 	})();
-})();
+})();

package/partialMock/simple/newPartialMockSpec/testRepeat.js

@@ -1,6 +1,6 @@
 var newSut = require('../newPartialMock');
 var assert = require('assert');
-var test = require('../../../test');
+var test = require('node:test');
 		var originalReturnValue = {orig:''};
 		function original() {
 			return originalReturnValue;
@@ -11,10 +11,8 @@ var test = require('../../../test');
 
 
 (function(){
-	console.log('partialMockSpec.repeat.');
 
 	(function() {		
-		console.log('expect return foo three times.');
 		var sut = newSut(original);
 
 		sut.expect().return(foo).repeat(3);
@@ -38,7 +36,6 @@ var test = require('../../../test');
 	})();
 
 	(function() {		
-		console.log('expect return foo any.');
 		var sut = newSut(original);
 
 		sut.expect().return(foo).repeatAny();
@@ -60,4 +57,4 @@ var test = require('../../../test');
     	});
 
 	})();
-})();
+})();