From 35304a81710f726daf372b42d641d0bd5d51843f Mon Sep 17 00:00:00 2001 From: Mike Keesey Date: Wed, 29 Jan 2014 15:40:35 -0800 Subject: [PATCH] Made breeze-tests.ts compliant with --noImplicitAny. --- breeze/breeze-tests.ts | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/breeze/breeze-tests.ts b/breeze/breeze-tests.ts index e4ee91f74..3fe45d8bf 100644 --- a/breeze/breeze-tests.ts +++ b/breeze/breeze-tests.ts @@ -440,7 +440,7 @@ function test_entityState() { function test_entityType() { var myMetadataStore: breeze.MetadataStore; var myEntityType: breeze.EntityType; - var dataProperty1, dataProperty2, navigationProperty1: breeze.DataProperty; + var dataProperty1: breeze.DataProperty, dataProperty2: breeze.DataProperty, navigationProperty1: breeze.DataProperty; var em1: breeze.EntityManager; var entityManager = new breeze.EntityType({ metadataStore: myMetadataStore, @@ -453,7 +453,7 @@ function test_entityType() { myEntityType.addProperty(navigationProperty1); var custType = em1.metadataStore.getEntityType("Customer"); var countryProp = custType.getProperty("Country"); - var valFn = function (v) { + var valFn = function (v: string) { if (v == null) return true; return (v.substring(0,2) === "US"); }; @@ -533,15 +533,20 @@ function test_entityType() { // DayOfWeek.Friday.toString() === "Friday"; //} +interface CustomEntityManager extends breeze.EntityManager +{ + customTag: string; +} + function test_event() { - var myEntityManager: breeze.EntityManager; - var myEntity, person: breeze.Entity; + var myEntityManager: CustomEntityManager; + var myEntity: breeze.Entity, person: breeze.Entity; var salaryEvent = new core.Event("salaryEvent", person); core.Event.enable("propertyChanged", myEntityManager, false); core.Event.enable("propertyChanged", myEntityManager, true); core.Event.enable("propertyChanged", myEntity.entityAspect, false); core.Event.enable("propertyChanged", myEntity.entityAspect, null); - core.Event.enable("validationErrorsChanged", myEntityManager, function (em) { + core.Event.enable("validationErrorsChanged", myEntityManager, function (em: CustomEntityManager) { return em.customTag === "blue"; }); core.Event.isEnabled("propertyChanged", myEntityManager); @@ -694,8 +699,18 @@ function test_validationOptions() { var newOptions = validationOptions.using({ validateOnQuery: true, validateOnSave: false }); } +interface NumericRange +{ + max: number; + min: number; +} + +interface NumericRangeValidatorFunctionContext extends breeze.ValidatorFunctionContext, NumericRange +{ +} + function test_validator() { - var valFn = function (v) { + var valFn = function (v: any) { if (v == null) return true; return ( v.substr(0,2)=== "US"); }; @@ -707,11 +722,11 @@ function test_validator() { var custType = metadataStore.getEntityType("Customer"); var countryProp = custType.getProperty("Country"); countryProp.validators.push(countryValidator); - function isValidZipCode(value) { + function isValidZipCode(value: string) { var re = /^\d{5}([\-]\d{4})?$/; return (re.test(value)); } - var valFn = function (v) { + valFn = function (v: any) { if (v.getProperty("Country") === "USA") { var postalCode = v.getProperty("PostalCode"); return isValidZipCode(postalCode); @@ -723,8 +738,8 @@ function test_validator() { var em1: breeze.EntityManager; var custType = em1.metadataStore.getEntityType("Customer"); custType.validators.push(zipCodeValidator); - var numericRangeValidator = function (context) { - var valFn = function (v, ctx) { + var numericRangeValidator = function (context: NumericRange) { + var valFn = function (v: any, ctx: NumericRangeValidatorFunctionContext) { if (v == null) return true; if (typeof (v) !== "number") return false; if (ctx.min != null && v < ctx.min) return false; @@ -784,7 +799,7 @@ function test_validator() { var errMsg = result.errorMessage; var context = result.context; var sameValidator = result.validator; - var valFn = function (v) { + valFn = function (v: any) { if (v == null) return true; return (v.substr(0,2) === "US"); }; @@ -807,7 +822,7 @@ function test_demo() { function test_corefns() { var o1: Object; - var kvfn = function (p) { return p; } + var kvfn = function (p: any) { return p; } core.objectForEach(o1, kvfn); var o2: Object;