meadow 1.1.1 → 2.0.1

package/test/Meadow-Provider-MySQL_tests.js

@@ -13,7 +13,7 @@ var Expect = Chai.expect;
 var Assert = Chai.assert;
 
 var libMySQL = require('mysql2');
-var libAsync = require('async');
+var libAsyncWaterfall = require('async/waterfall');
 
 var tmpFableSettings = 	(
 {
@@ -29,18 +29,20 @@ var tmpFableSettings = 	(
 		},
 	LogStreams:
 	[
-	    {
-	        level: 'fatal',
-	        streamtype:'process.stdout',
-	    },
-	    {
-	        level: 'trace',
-	        path: __dirname+'/../tests.log'
-	    }
+		{
+			level: 'fatal',
+			streamtype:'process.stdout',
+		},
+		{
+			level: 'trace',
+			path: __dirname+'/../tests.log'
+		}
 	]
 });
 
-var libFable = require('fable').new(tmpFableSettings);
+var libFable = new (require('fable'))(tmpFableSettings);
+
+var _SQLConnectionPool = false;
 
 libFable.MeadowMySQLConnectionPool = libMySQL.createPool
 (
@@ -129,14 +131,14 @@ suite
 				.setDefault(_AnimalDefault)
 		};
 
-		setup
+		suiteSetup
 		(
 			function(fDone)
 			{
 				// Only do this for the first test.
 				if (!_SpooledUp)
 				{
-					var _SQLConnectionPool = libMySQL.createPool
+					_SQLConnectionPool = libMySQL.createPool
 					(
 						{
 							connectionLimit: tmpFableSettings.MySQL.ConnectionPoolLimit,
@@ -149,7 +151,7 @@ suite
 					);
 
 					// Tear down previous test data
-					libAsync.waterfall(
+					libAsyncWaterfall(
 					[
 						function(fCallBack)
 						{
@@ -202,6 +204,11 @@ suite
 			}
 		);
 
+		suiteTeardown((fDone) => {
+			_SQLConnectionPool.end(fDone);
+		}
+		);
+
 		suite
 		(
 			'Object Sanity',
@@ -379,6 +386,35 @@ suite
 					}
 				);
 				test
+				(
+					'Undelete a record in the database',
+					function(fDone)
+					{
+						var testMeadow = newMeadow();
+
+						testMeadow.fable.settings.QueryThresholdWarnTime = 1;
+						var tmpDeleteQuery = testMeadow.query.addFilter('IDAnimal',5);
+
+						// Make sure the record is deleted!
+						testMeadow.doDelete(tmpDeleteQuery,
+							function(pDeleteError, pDeleteQuery, pDeleteRecord)
+							{
+								var tmpQuery = testMeadow.query.addFilter('IDAnimal',5);
+								testMeadow.doUndelete(tmpQuery,
+									function(pError, pQuery, pRecord)
+									{
+										// It returns the number of rows deleted
+										Expect(pRecord)
+											.to.equal(1);
+
+										testMeadow.fable.settings.QueryThresholdWarnTime = 1000;
+
+										fDone();
+									});
+							});
+					}
+				);
+				test
 				(
 					'Count all records from the database',
 					function(fDone)

package/test/Meadow-Provider-None_tests.js

@@ -10,20 +10,8 @@ var Chai = require("chai");
 var Expect = Chai.expect;
 var Assert = Chai.assert;
 
-var libFable = require('fable').new({
-	LogStreams:
-	[
-	    {
-	        level: 'fatal',
-	        streamtype:'process.stdout',
-	    },
-	    {
-	        level: 'trace',
-	        path: __dirname+'/../tests.log'
-	    }
-	]
-});
-var libFoxHound = require('foxhound');
+var libFable = new (require('fable'))({ Product:'MeadowProviderNone'});
+var libMeadow = require('../source/Meadow.js');
 
 var _AnimalJsonSchema = (
 {
@@ -74,7 +62,7 @@ suite
 	{
 		var newMeadow = function()
 		{
-			return require('../source/Meadow.js').new(libFable, 'FableTest');
+			return libMeadow.new(libFable, 'FableTest');
 		};
 
 		setup
@@ -94,7 +82,7 @@ suite
 					'The class should initialize itself into a happy little object.',
 					function()
 					{
-						var testMeadow = require('../source/Meadow.js').new(libFable);
+						var testMeadow = libMeadow.new(libFable);
 						Expect(testMeadow).to.be.an('object', 'Meadow should initialize as an object directly from the require statement.');
 					}
 				);
@@ -186,6 +174,21 @@ suite
 					}
 				);
 				test
+				(
+					'Undelete a record in the database',
+					function(fDone)
+					{
+						var testMeadow = newMeadow();
+						testMeadow.doUndelete(testMeadow.query,
+							function(pError, pQuery, pRecord)
+							{
+								Expect(pQuery.parameters.result.executed).to.equal(true);
+								fDone();
+							}
+						)
+					}
+				);
+				test
 				(
 					'Count all records from the database',
 					function(fDone)

package/test/Meadow_tests.js

@@ -58,7 +58,7 @@ suite
 		(
 			function()
 			{
-				_Fable = libFable.new(
+				_Fable = new libFable(
 				{
 					LogStreams:
 					[
@@ -216,6 +216,63 @@ suite
 					}
 				);
 				test
+				(
+					'Try to load from a json object',
+					function()
+					{
+						var testMeadow = require('../source/Meadow.js').new(_Fable).loadFromPackageObject(
+						{
+							"Scope": "MyPackage",
+						
+							"DefaultIdentifier": "IDMyPackage",
+						
+							"Schema": [
+								{ "Column": "IDMyPackage",   "Type":"AutoIdentity" },
+								{ "Column": "GUIDMyPackage", "Type":"AutoGUID" },
+								{ "Column": "Name",          "Type":"String" },
+								{ "Column": "Age",           "Type":"Number" }
+							],
+						
+							"DefaultObject": {
+								"IDMyPackage": 0,
+								"GUIDMyPackage": "0000-0000",
+						
+								"Name": "Unknown",
+								"Age": 0
+							},
+						
+							"JsonSchema": {
+								"title": "MyPackage",
+								"description": "A nondescript package.",
+								"type": "object",
+								"properties": {
+									"IDMyPackage": {
+										"description": "The unique identifier for our package",
+										"type": "integer"
+									},
+									"GUIDMyPackage": {
+										"description": "A string UUID for our package",
+										"type": "string"
+									},
+									"Name": {
+										"description": "The name",
+										"type": "string"
+									},
+									"Age": {
+										"description": "How old the package is",
+										"type": "number",
+										"minimum": 0,
+										"exclusiveMinimum": true
+									}
+								},
+								"required": ["IDMyPackage", "Name"]
+							}
+						});
+						Expect(testMeadow.scope)
+							.to.equal('MyPackage');
+					}
+				)
+				test
 				(
 					'Try to load from an empty json package',
 					function()
@@ -242,7 +299,7 @@ suite
 					function()
 					{
 						// given
-						_Fable = libFable.new(
+						_Fable = new libFable(
 						{
 							MeadowRoleNames: ['Cool', 'Bold', 'Tired'],
 							LogStreams: