Added tests for bi-directional to-one relations

bsingr · Nov 22, 2010 · 600deb2 · 600deb2
1 parent 7aa5a63
commit 600deb2
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 11 deletions.
diff --git a/spec/model/model-spec.js b/spec/model/model-spec.js
@@ -60,6 +60,12 @@ describe("coherent.Model", function() {
         object.setValueForKey(123, 'zebra');
       }
       expect(testInvalidType).toThrow("Invalid type for zebra");
+
+      function testInvalidTypeSetter()
+      {
+        object.setZebra(123);
+      }
+      expect(testInvalidTypeSetter).toThrow("Invalid type for zebra");
     });
 
     it("should convert date from strings", function() {

diff --git a/spec/model/model-to-one-spec.js b/spec/model/model-to-one-spec.js
@@ -1,25 +1,53 @@
 describe("Model ToOne relations", function() {
 
-  it("should set inverse relation", function() {
-    var M1= Model("Model1", {
+  beforeEach(function(){
+    coherent.Model._resetModels();
+
+    this.M1= Model("Model1", {
       m2: Model.ToOne({
             type: "Model2",
             inverse: "m1"
           })
     });
 
-    var M2= Model("Model2", {
+    this.M2= Model("Model2", {
       m1: Model.ToOne({
             type: "Model1",
             inverse: "m2"
           })
     });
 
-    var m1= new M1();
-    var m2= new M2();
+
+  });
+
+  it("should set inverse relation via setValueForKey", function() {
+    var m1= new this.M1();
+    var m2= new this.M2();
 
     m1.setValueForKey(m2, 'm2');
     expect(m2.m1()).toBe(m1);
   });
 
+  it("should set inverse relation via set method", function() {
+    var m1= new this.M1();
+    var m2= new this.M2();
+
+    m1.setM2(m2);
+    expect(m2.m1()).toBe(m1);
+  });
+
+  it("should clear previous inverse relation when setting new value", function() {
+    var m1= new this.M1();
+    var m2= new this.M2();
+    var m2a= new this.M2();
+
+    debugger;
+    m1.setM2(m2);
+    expect(m2.m1()).toBe(m1);
+
+    m1.setM2(m2a);
+    expect(m2.m1()).toBeNull();
+    expect(m2a.m1()).toBe(m1);
+  });
+
 });
diff --git a/src/model/Model.js b/src/model/Model.js
@@ -178,7 +178,7 @@
 
   coherent.Model.ToOne= function(decl)
   {
-    decl= Object.extend(coherent.Model.ToOne.DEFAULTS, decl);
+    decl= Object.applyDefaults(decl, coherent.Model.ToOne.DEFAULTS);
     return new coherent.Model.Property(decl);
   }
 

diff --git a/src/model/ModelObject.js b/src/model/ModelObject.js
@@ -85,7 +85,7 @@
       var methodInfo= this.constructor.__classInfo.methods[key];
       var previous;
 
-      if (methodInfo && methodInfo.type &&
+      if (void(0)!=value && methodInfo && methodInfo.type &&
           ((methodInfo.primitive && value.constructor!==methodInfo.type) ||
            (!methodInfo.primitive && !(value instanceof methodInfo.type))))
       {
@@ -118,19 +118,19 @@
 
       if (inverse.relation===coherent.Model.ToOne)
       {
-        if (this===previousInverse)
+        if (previous && this===previousInverse)
           previous.setValueForKey(null, methodInfo.inverse);
-        if (this!==valueInverse)
+        if (value && this!==valueInverse)
           value.setValueForKey(this, methodInfo.inverse);
       }
       else if (inverse.relation===coherent.Model.ToMany)
       {
         var previousIndexOfThis= previousInverse ? previousInverse.indexOfObject(this) : -1;
         var valueIndexOfThis= value ? value.indexOfObject(this) : -1;
 
-        if (-1!==previousIndexOfThis)
+        if (previousInverse && -1!==previousIndexOfThis)
           previousInverse.removeObjectAtIndex(previousIndexOfThis);
-        if (-1===valueIndexOfThis)
+        if (value && -1===valueIndexOfThis)
           value.addObject(this);
       }
     },