From 6585641c803b29043ea32924601533a5c8a052df Mon Sep 17 00:00:00 2001 From: vvakame Date: Thu, 3 Sep 2015 22:05:33 +0900 Subject: [PATCH] adhoc fix breeze/breeze-tests.ts --- breeze/breeze-tests.ts | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/breeze/breeze-tests.ts b/breeze/breeze-tests.ts index f309462af..1f9c87dfa 100644 --- a/breeze/breeze-tests.ts +++ b/breeze/breeze-tests.ts @@ -11,7 +11,7 @@ function test_dataType() { var x = typ.parentEnum === breeze.DataType; var isFalse = breeze.DataType.contains(breeze.DataType.Double); var dt = breeze.DataType.fromName("Decimal"); - + } function test_dataProperty() { @@ -33,7 +33,7 @@ function test_dataService() { var em = new breeze.EntityManager({ dataService: ds }); - + } function test_entityAspect() { @@ -69,7 +69,7 @@ function test_entityAspect() { var errorsAdded = validationChangeArgs.added; var errorsCleared = validationChangeArgs.removed; }); - + } function test_entityKey() { @@ -132,7 +132,7 @@ function test_entityManager() { serviceName: "breeze/NorthwindIBModel", metadataStore: metadataStore }); - + return new breeze.QueryOptions({ mergeStrategy: null, fetchStrategy: this.fetchStrategy @@ -157,7 +157,7 @@ function test_entityManager() { var cust2 = em1.createEntity("Customer", { companyName: "foo" }); var cust3 = em1.createEntity("foo", { xxx: 3 }, breeze.EntityState.Added); - + em1.attachEntity(cust1, breeze.EntityState.Added); em1.clear(); var em2 = em1.createEmptyCopy(); @@ -246,7 +246,7 @@ function test_entityManager() { var custType = em1.metadataStore.getEntityType("Customer"); var orderType = em1.metadataStore.getEntityType("Order"); if (em1.hasChanges([custType, orderType])) { }; - + var bundle = em1.exportEntities(); window.localStorage.setItem("myEntityManager", bundle); var bundleFromStorage = window.localStorage.getItem("myEntityManager"); @@ -434,7 +434,7 @@ function test_entityState() { return es === breeze.EntityState.Unchanged; var es = anEntity.entityAspect.entityState; return es.isUnchangedOrModified(); - + return es === breeze.EntityState.Unchanged || es === breeze.EntityState.Modified; } @@ -443,12 +443,14 @@ function test_entityType() { var myEntityType: breeze.EntityType; var dataProperty1: breeze.DataProperty, dataProperty2: breeze.DataProperty, navigationProperty1: breeze.DataProperty; var em1: breeze.EntityManager; + /* NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590 var entityManager = new breeze.EntityType({ metadataStore: myMetadataStore, serviceName: "breeze/NorthwindIBModel", name: "person", namespace: "myAppNamespace" }); + */ myEntityType.addProperty(dataProperty1); myEntityType.addProperty(dataProperty2); myEntityType.addProperty(navigationProperty1); @@ -759,9 +761,11 @@ function test_validator() { orderType = em1.metadataStore.getEntityType("Order"); var orderDateProperty = orderType.getProperty("OrderDate"); orderDateProperty.validators.push(breeze.Validator.date()); + /* NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590 var v0 = breeze.Validator.maxLength({ maxLength: 5, displayName: "City" }); v0.validate("adasdfasdf"); var errMessage = v0.getMessage(); + */ custType = em1.metadataStore.getEntityType("Customer"); var customerIdProperty = custType.getProperty("CustomerID"); customerIdProperty.validators.push(breeze.Validator.guid()); @@ -788,6 +792,7 @@ function test_validator() { regionProperty.validators.push(breeze.Validator.string()); custType = em1.metadataStore.getEntityType("Customer"); regionProperty = custType.getProperty("Region"); + /* NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590 regionProperty.validators.push(breeze.Validator.stringLength({ minLength: 2, maxLength: 5 })); var validator = breeze.Validator.maxLength({ maxLength: 5, displayName: "City" }); var result = validator.validate("asdf"); @@ -796,6 +801,7 @@ function test_validator() { var errMsg = result.errorMessage; var context = result.context; var sameValidator = result.validator; + */ var valFn = function (v: any) { if (v == null) return true; return (v.substr(0,2) === "US");