a_mock 2.0.2 → 2.0.4

package/partialMock/expectCoreSpec/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');
 
@@ -15,7 +15,6 @@ var sut = require('../expectCore');
 
 
 (function(){
-	console.log('expectCore');
 	var mockContext = {};
 	var compositeAreCorrectArguments = newMock();
 	var whenCalledEmitter = {}	;
@@ -60,7 +59,6 @@ var sut = require('../expectCore');
 	});
 
 	(function() {
-		console.log('expect');
 		var expected = {};
 		var arg = {};
 		var arg2 = {};
@@ -73,7 +71,6 @@ var sut = require('../expectCore');
 	})();
 
 	(function() {
-		console.log('expectAnything');
 		var expected = {};
 		var arg = {};
 		expectAnything.expect(index+1).expect(mockContext).return(expected);
@@ -85,7 +82,6 @@ var sut = require('../expectCore');
 	})();
 
 	(function() {
-		console.log('ignore');
 		var expected = {};
 		var arg = {};
 		ignore.expect(index+1).expect(mockContext).return(expected);
@@ -97,7 +93,6 @@ var sut = require('../expectCore');
 	})();
 
 	(function() {
-		console.log('expectArray');
 		var expected = {};
 		var arg = {};		
 		expectArray.expect(index+1).expect(mockContext).expect(arg).return(expected);
@@ -109,7 +104,6 @@ var sut = require('../expectCore');
 	})();
 
 	(function() {
-		console.log('return');
 		var expected = {};
 		var arg = {};
 		_return.expect(arg).expect(index+1).expect(mockContext).return(expected);
@@ -121,7 +115,6 @@ var sut = require('../expectCore');
 	})();
 
 	(function() {
-		console.log('whenCalled');
 		var callback = {};
 		var expected;
 		var add = newMock();
@@ -147,7 +140,6 @@ var sut = require('../expectCore');
 	})();
 
 	(function() {
-		console.log('throw');
 		var error = {};
 		var _throw = {};
 		var expected = {};
@@ -163,7 +155,6 @@ var sut = require('../expectCore');
 
 
 	(function() {
-		console.log('repeat');
 		var expected = {};
 		var times = 2;
 		var returnContext = {};
@@ -186,7 +177,6 @@ var sut = require('../expectCore');
 	})();
 
 	(function() {
-		console.log('repeatAny');
 		var expected = {};
 		var returnContext = {};
 		var repeatMock = newMock();
@@ -208,7 +198,6 @@ var sut = require('../expectCore');
 	})();
 
 	(function() {
-		console.log('resolve');
 		var expected = {};
 		var arg = {};
 		promise = {};
@@ -223,7 +212,6 @@ var sut = require('../expectCore');
 	})();
 
 	(function() {
-		console.log('reject');
 		var expected = {};
 		var arg = {};
 		promise = {};
@@ -238,4 +226,4 @@ var sut = require('../expectCore');
 	})();
 
 
-})();
+})();

package/partialMock/expectEmpty.js

@@ -10,9 +10,10 @@ function expectEmpty(mockContext) {
 	mockContext.compositeAreCorrectArguments.add(hasCorrectArgument);
 	mockContext.numberOfArgs = 0;
 
-	c.return = function(arg) {
-		return _return(arg,0,mockContext);
-	};
+	c.return = function(arg) {
+		return _return(arg,0,mockContext);
+	};
+	c.returnLoose = c.return;
 
 	c.whenCalled = function(callback) {
 		mockContext.whenCalledEmitter.add(callback);
@@ -45,4 +46,4 @@ function expectEmpty(mockContext) {
 	return c;
 }
 
-module.exports = expectEmpty;
+module.exports = expectEmpty;

package/partialMock/expectEmptySpec/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');
 
@@ -12,7 +12,6 @@ var sut = require('../expectEmpty');
 
 
 (function() {
-	console.log('expectEmpty');
 	var mockContext = {};
 	var compositeAreCorrectArguments = newMock();
 	var whenCalledEmitter = {}	;
@@ -63,7 +62,6 @@ var sut = require('../expectEmpty');
 	});
 
 	(function() {
-		console.log('return');
 		var expected = {};
 		var arg = {};
 		_return.expect(arg).expect(index).expect(mockContext).return(expected);
@@ -75,7 +73,6 @@ var sut = require('../expectEmpty');
 	})();
 
 	(function() {
-		console.log('whenCalled');
 		var callback = {};
 		var expected;
 		var add = newMock();
@@ -101,7 +98,6 @@ var sut = require('../expectEmpty');
 	})();
 
 	(function() {
-		console.log('throw');
 		var error = {};				
 		var _throw = {};
 		var expected = {};
@@ -117,7 +113,6 @@ var sut = require('../expectEmpty');
 	})();
 
 	(function() {
-		console.log('repeat');
 		var expected = {};
 		var times = 2;
 		var returnContext = {};
@@ -140,7 +135,6 @@ var sut = require('../expectEmpty');
 	})();
 
 	(function() {
-		console.log('repeatAny');
 		var expected = {};
 		var returnContext = {};
 		var repeatMock = newMock();
@@ -162,7 +156,6 @@ var sut = require('../expectEmpty');
 	})();
 
 	(function() {
-		console.log('resolve');
 		var expected = {};
 		var arg = {};
 		newThen.resolve = newMock();
@@ -177,7 +170,6 @@ var sut = require('../expectEmpty');
 	})();
 
 	(function() {
-		console.log('reject');
 		var expected = {};
 		var arg = {};
 		newThen.reject = newMock();
@@ -191,4 +183,4 @@ var sut = require('../expectEmpty');
 		});
 	})();
 
-})();
+})();

package/partialMock/expectSpec/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 newAreSameArgument = newRequireMock('./newHasSameArgument');
 var sut = require('../expect');
 
 (function() {
-	console.log('expect');
 	var mockContext = {};
 	var areSameArgument = newMock();	
 	var arg = 'arg';
@@ -42,4 +41,4 @@ var sut = require('../expect');
 		assert.equal(expected,returned);
 	});
 
-})();
+})();

package/partialMock/hasSameArgument/isEqualArgSpec/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,12 +7,10 @@ var sut = require('../isEqualArg');
 
 
 (function() {
-    console.log('isEqualArg');
     var expectedArg = {};
     var index = 1;
 
     (function() {
-        console.log('shallow.not deepEqual.execute');
         var arg = {};
         var returned = sut(expectedArg, arg);
 
@@ -23,7 +21,6 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('shallow.null other.execute');
         var arg = {};
         var returned = sut(null, arg);
 
@@ -35,7 +32,6 @@ var sut = require('../isEqualArg');
 
 
     (function() {
-        console.log('shallow.is deepEqual.execute');
         var returned = sut(expectedArg, expectedArg);
 
         test('it should return true', function() {
@@ -45,7 +41,6 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('array with incorrect length.execute');
         var returned = sut([], [2]);
 
         test('it should return false', function() {
@@ -56,7 +51,6 @@ var sut = require('../isEqualArg');
 
 
     (function() {
-        console.log('array and other type.execute');
         var returned = sut([2], 2);
 
         test('it should return false', function() {
@@ -66,7 +60,6 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('shallow.array with different contents.execute');
         var returned = sut([1], [2]);
 
         test('it should return false', function() {
@@ -76,8 +69,7 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('shallow.array with equal contents.execute');
-        var returned = sut([expectedArg, 1, 'foo', new Buffer('abc'), new Date(2000)], [expectedArg, 1, 'foo', new Buffer('abc'), new Date(2000)]);
+        var returned = sut([expectedArg, 1, 'foo', Buffer.from('abc'), new Date(2000)], [expectedArg, 1, 'foo', Buffer.from('abc'), new Date(2000)]);
 
         test('it should return true', function() {
             assert.equal(true, returned);
@@ -86,7 +78,6 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('nested.array with equal contents.execute');
         var returned = sut([expectedArg, [1, [2, 3]], 'foo'], [expectedArg, [1, [2, 3]], 'foo']);
 
         test('it should return true', function() {
@@ -95,7 +86,6 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('nested.array with non equal contents.execute');
         var returned = sut([expectedArg, [1, [2, 3, 4]], 'foo'], [expectedArg, [1, [2, 3]], 'foo']);
 
         test('it should return false', function() {
@@ -104,7 +94,6 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('struct with different architecture.execute');
         var returned = sut({
             a: 1
         }, {
@@ -117,7 +106,6 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('struct with same architecture, different values.execute');
         var returned = sut({
             a: 1
         }, {
@@ -130,7 +118,6 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('struct with same architecture, equal values.execute');
         var returned = sut({
             a: 1
         }, {
@@ -143,7 +130,6 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('advanced struct with same architecture, equal values.execute');
         var Foo = function() {
             this.arg = 'arg';
         };
@@ -168,7 +154,6 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('two new objects with equal properties of same class, equal values.execute');
         var Foo = function() {
             this.arg = 'arg';
         };
@@ -183,7 +168,6 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('two new objects with non equal properties of same class, equal values.execute');
         var Foo = function(value) {
             this.arg = value;
         };
@@ -198,7 +182,6 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('two new objects of same class with no properties, equal values.execute');
         var Foo = function() {};
         var foo = new Foo();
         var foo2 = new Foo();
@@ -211,8 +194,7 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('buffers with equal contents.execute');
-        var returned = sut(new Buffer('abc'), new Buffer('abc'));
+        var returned = sut(Buffer.from('abc'), Buffer.from('abc'));
 
         test('it should return true', function() {
             assert.equal(true, returned);
@@ -221,8 +203,7 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('buffer and non-buffer contents.execute');
-        var returned = sut(new Buffer('abc'), 'abc');
+        var returned = sut(Buffer.from('abc'), 'abc');
 
         test('it should return false', function() {
             assert.equal(false, returned);
@@ -231,8 +212,7 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('buffers with different contents.execute');
-        var returned = sut(new Buffer('aba'), new Buffer('abc'));
+        var returned = sut(Buffer.from('aba'), Buffer.from('abc'));
 
         test('it should return false', function() {
             assert.equal(false, returned);
@@ -241,8 +221,7 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('buffers partly equal contents.execute');
-        var returned = sut(new Buffer('ab'), new Buffer('abc'));
+        var returned = sut(Buffer.from('ab'), Buffer.from('abc'));
 
         test('it should return false', function() {
             assert.equal(false, returned);
@@ -251,7 +230,6 @@ var sut = require('../isEqualArg');
     })();
 
     (function() {
-        console.log('equal dates.execute');
         var returned = sut(new Date(2015,5,24), new Date(2015,5,24));
 
         test('it should return true', function() {
@@ -261,7 +239,6 @@ var sut = require('../isEqualArg');
     })();
 
 	(function() {
-        console.log('non equal dates.execute');
         var returned = sut(new Date(2015,5,22), new Date(2015,5,24));
 
         test('it should return false', function() {
@@ -271,7 +248,6 @@ var sut = require('../isEqualArg');
     })();
 
 	(function() {
-        console.log('date and undefined.execute');
         var returned = sut(undefined, new Date(2015,5,24));
 
         test('it should return false', function() {
@@ -280,4 +256,4 @@ var sut = require('../isEqualArg');
 
     })();
 
-})();
+})();

package/partialMock/ignoreSpec/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');
 
@@ -10,7 +10,6 @@ var sut = require('../ignore');
 
 
 (function(){
-	console.log('ignore');
 	var mockContext = {};
 	var index = {};
 	var expected = {};
@@ -27,4 +26,4 @@ var sut = require('../ignore');
 		assert.equal(expected,returned);
 	});
 
-})();
+})();

package/partialMock/mockContext/reset.js

@@ -1,16 +1,16 @@
-var newFallbackWrapper = require('../newFallbackWrapper');
-var newAnd = require('../../newMutableAnd')
-
-function _new(mockContext,originalFallback,thisArg) {
-	var and = newAnd();	
-	mockContext.execute = newFallbackWrapper(originalFallback, thisArg);
-	mockContext.originalFallback = originalFallback;
-	mockContext.thisArg = thisArg;
-	mockContext.lastExecute = mockContext.execute;
-	mockContext.compositeAreCorrectArguments = and;
-	mockContext.expectCount = 0;
-	
-	return mockContext;
-}
+var newFallbackWrapper = require('../newFallbackWrapper');
+var newAnd = require('../../newMutableAnd')
 
-module.exports = _new;
+function _new(mockContext,originalFallback,thisArg) {
+	var and = newAnd();	
+	mockContext.execute = newFallbackWrapper(originalFallback, thisArg);
+	mockContext.originalFallback = originalFallback;
+	mockContext.thisArg = thisArg;
+	mockContext.lastExecute = mockContext.execute;
+	mockContext.compositeAreCorrectArguments = and;
+	mockContext.expectCount = 0;
+	
+	return mockContext;
+}
+
+module.exports = _new;

package/partialMock/mockContext/resetSpec/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,12 +9,12 @@ var newMutableAnd = newRequireMock('../../newMutableAnd');
 var sut = require('../reset');
 
 (function() {
-	console.log('reset mock');
 	var context = {};
 	var originalFallback = {};
 	var fallbackWrapper = {};
 	var mutableAnd = {};
-	newFallbackWrapper.expect(originalFallback).return(fallbackWrapper);
+	// thisArg is optional and should not be required by callers.
+	newFallbackWrapper.expect(originalFallback).expectAnything().return(fallbackWrapper);
 	newMutableAnd.expect().return(mutableAnd);
 	
 	sut(context,originalFallback);
@@ -39,4 +39,4 @@ var sut = require('../reset');
 		assert.equal(context.expectCount,0);
 	});
 	
-})();
+})();

package/partialMock/negotiateDecrementExpectCountSpec/test.js

@@ -1,12 +1,10 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var sut = require('../negotiateDecrementExpectCount');
 
 (function() {
-	console.log('negotiateDecrementExpectCount');
 	
 	(function(){
-		console.log('times is undefined.execute');
 		var mockContext = {};		
 		mockContext.expectCount = 2;
 		var times;
@@ -18,7 +16,6 @@ var sut = require('../negotiateDecrementExpectCount');
 	})();
 	
 	(function(){
-		console.log('times is set.execute');
 		var mockContext = {};		
 		mockContext.expectCount = 2;
 		var times = 5;

package/partialMock/negotiateEndSpec/test.js

@@ -1,4 +1,4 @@
-var test = require('../../test');
+var test = require('node:test');
 var assert = require('assert');
 var requireMock = require('../simple/newRequireMock');
 var expectRequire = require('../simple/expectRequire');
@@ -7,10 +7,8 @@ var _return = requireMock('./return');
 var mockContext = {};
 var sut = require('../negotiateEnd');
 
-console.log('negotiateEnd');
 
 	(function() {
-		console.log('2 args pending.when execute');
 		var numberOfArgs = 2;
 		var didCallReturn;
 		mockContext.numberOfArgs = numberOfArgs;
@@ -31,7 +29,6 @@ console.log('negotiateEnd');
 
 
 (function() {
-		console.log('0 args pending.when execute');
 		var numberOfArgs = 0;
 		var didCallReturn;
 		mockContext.numberOfArgs = numberOfArgs;
@@ -53,7 +50,6 @@ console.log('negotiateEnd');
 
 
 	(function() {
-		console.log('not pending.when execute');		
 		mockContext.numberOfArgs = undefined;
 		sut(mockContext);
 
@@ -61,4 +57,3 @@ console.log('negotiateEnd');
 			assert.ok(1);
 		});
 	})();
-

package/partialMock/negotiateIncrementExpectCountSpec/test.js

@@ -1,12 +1,10 @@
 var assert = require('assert');
-var test = require('../../test');
+var test = require('node:test');
 var sut = require('../negotiateIncrementExpectCount');
 
 (function() {
-	console.log('negotiateIncrementExpectCount');
 
 	(function(){
-		console.log('times is undefined.execute');
 		var mockContext = {};		
 		mockContext.expectCount = 2;
 		var times;
@@ -18,7 +16,6 @@ var sut = require('../negotiateIncrementExpectCount');
 	})();
 	
 	(function(){
-		console.log('times is set.execute');
 		var mockContext = {};		
 		mockContext.expectCount = 2;
 		var times = 5;

package/partialMock/newExecute.js

@@ -3,14 +3,14 @@ function newExecute(returnValue,hasCorrectArguments,mockContext,shouldDecrementE
 	var _fallback = mockContext.originalFallback;
 	var whenCalledEmitter = mockContext.whenCalledEmitter;
 
-	function execute() {
-		var args = [returnValue,_fallback,hasCorrectArguments,mockContext,shouldDecrementExpectCount,whenCalledEmitter];
-		for(var index = 0; index < arguments.length; index++) {
-			args.push(arguments[index]);
-		}
-		return _execute.apply(this,args);
-		returnValue,fallback,hasCorrectArguments
-	}
+	function execute() {
+		var args = [returnValue,_fallback,hasCorrectArguments,mockContext,shouldDecrementExpectCount,whenCalledEmitter];
+		for(var index = 0; index < arguments.length; index++) {
+			args.push(arguments[index]);
+		}
+		return _execute.apply(this,args);
+		returnValue,fallback,hasCorrectArguments
+	}
 
 	execute.setFallback = function(fallback) {
 		_fallback = fallback;
@@ -19,4 +19,4 @@ function newExecute(returnValue,hasCorrectArguments,mockContext,shouldDecrementE
 	return execute;
 }
 
-module.exports = newExecute;
+module.exports = newExecute;

package/partialMock/newExecuteSpec/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 execute = newRequireMock('./execute');
 var sut = require('../newExecute');
 
 (function(){
-	console.log('newExecute');
 	var mockContext = {};
 	var returnValue = {};
 	var compositeAreCorrectArguments = {};
@@ -25,7 +24,6 @@ var sut = require('../newExecute');
 	var sut2 = sut(returnValue,compositeAreCorrectArguments,mockContext,sholdDecrementExpectCount);
 
 	(function() {
-		console.log('execute');
 		var arg = {};
 		var arg2 = {};
 		var expected = {};		
@@ -40,12 +38,10 @@ var sut = require('../newExecute');
 
 
 	(function() {
-		console.log('setFallback');
 		var fallBack = {};
 		sut2.setFallback(fallBack);
 
 		(function(){
-			console.log('execute');
 			var arg = {};
 			var arg2 = {};
 			var expected = {};		
@@ -58,4 +54,4 @@ var sut = require('../newExecute');
 			});		
 		})();
 	})();
-})();
+})();