sproutcore 1.4.5-java → 1.5.0-java

data/lib/frameworks/sproutcore/frameworks/datastore/tests/data_sources/cascade.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Apple Inc. and contributors.
+// Copyright: ©2006-2011 Apple Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals module ok equals same test Sample */

data/lib/frameworks/sproutcore/frameworks/datastore/tests/data_sources/fixtures.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Apple Inc. and contributors.
+// Copyright: ©2006-2011 Apple Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals module ok equals same test MyApp Sample */
@@ -107,10 +107,15 @@ test("Update and commit a record", function() {
       fixture = fixtures.fixtureForStoreKey(store, storeKey);
 
   equals(fixture.name, rec.get('name'), 'precond - fixture state should match name');
+  equals(rec.get('status'), SC.Record.READY_CLEAN, "Status should be READY_CLEAN because no changes have been made");
 
   rec.set('name', 'foo');
+  equals(rec.get('status'), SC.Record.READY_DIRTY, "Status should be READY_DIRTY after changing name");
+
   store.commitRecords();
-  
+  equals(store.readStatus(storeKey), SC.Record.READY_CLEAN, "Status in store should be READY_CLEAN after save");
+  equals(rec.get('status'), SC.Record.READY_CLEAN, "Status in record should be READY_CLEAN after save");
+
   fixture = fixtures.fixtureForStoreKey(store, storeKey);
   equals(fixture.name, rec.get('name'), 'fixture state should update to match new name');
     

data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/contact_model.js

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals module test ok equals same AB */

data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/cyclical_relationship.js

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals module test ok equals same AB */
@@ -95,7 +95,7 @@ module("Cyclical relationships", {
 test("getting all contacts in a group", function() {
   var group  = AB.store.find(AB.Group, 100);
   var expected = AB.store.find(AB.Contact).filterProperty('group', group);
-  same(group.get('contacts'), expected, 'contacts');
+  same(group.get('contacts').toArray(), expected, 'contacts');
 });
 
 test("finding favoriteContacts", function() {

data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/mail_model.js

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals module test ok equals same */

data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/test_runner_model.js

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals module test ok equals same */

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/datetime_recordattribute.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Apple Inc. and contributors.
+// Copyright: ©2006-2011 Apple Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals module ok equals same test */

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/many_attribute.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Apple Inc. and contributors.
+// Copyright: ©2006-2011 Apple Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals module ok equals same test MyApp */

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/data_store.js

@@ -0,0 +1,180 @@
+/**
+ * Nested Records and the Data Store(SC.Record) Unit Test
+ *
+ * @author Evin Grano
+ */
+
+// ..........................................................
+// Basic Set up needs to move to the setup and teardown
+// 
+var NestedRecord, store, storeKeys; 
+
+var initModels = function(){
+  NestedRecord.Directory = SC.Record.extend({
+    /** Child Record Namespace */
+    nestedRecordNamespace: NestedRecord,
+    name: SC.Record.attr(String),
+    contents: SC.Record.toMany('SC.Record', { isNested: true })
+  });
+  
+  NestedRecord.File = SC.Record.extend({
+    name: SC.Record.attr(String)
+  });
+  
+};
+
+// ..........................................................
+// Basic SC.Record Stuff
+// 
+module("Data Store Tests for Nested Records", {
+
+  setup: function() {
+    NestedRecord = SC.Object.create({
+      store: SC.Store.create()
+    });
+    store = NestedRecord.store;
+    initModels();
+    SC.RunLoop.begin();
+    storeKeys = store.loadRecords([NestedRecord.Directory, NestedRecord.File], [
+      {
+        type: 'Directory',
+        name: 'Dir 1',
+        guid: 1,
+        contents: [
+          {
+            type: 'Directory',
+            name: 'Dir 2',
+            guid: 2,
+            contents: [
+              {
+                type: 'File',
+                guid: 3,
+                name: 'File 1'
+              },
+              {
+                type: 'File',
+                guid: 4,
+                name: 'File 2'
+              } 
+            ]
+          }
+        ]
+      },
+      {
+        type: 'File',
+        id: 5,
+        name: 'File 3'
+      }
+    ]);
+    SC.RunLoop.end();
+  },
+
+  teardown: function() {
+    delete NestedRecord.Directory;
+    delete NestedRecord.File;
+    NestedRecord = null;
+    store = null;
+  }
+});
+
+test("Proper Initialization",function() {
+  var first, second;
+  equals(storeKeys.get('length'), 2, "number of primary store keys should be 2");
+  
+  // First
+  first = store.materializeRecord(storeKeys[0]);
+  ok(SC.kindOf(first, SC.Record), "first record is a kind of a SC.Record Object");
+  ok(SC.instanceOf(first, NestedRecord.Directory), "first record is a instance of a NestedRecord.Directory Object");
+  
+  // Second
+  second = store.materializeRecord(storeKeys[1]);
+  ok(SC.kindOf(second, SC.Record), "second record is a kind of a SC.Record Object");
+  ok(SC.instanceOf(second, NestedRecord.File), "second record is a instance of a NestedRecord.File Object");
+});
+
+test("Proper Status",function() {
+  var first, second;
+  
+  // First
+  first = store.materializeRecord(storeKeys[0]);
+  equals(first.get('status'), SC.Record.READY_CLEAN, 'first record has a READY_CLEAN State');
+  
+  // Second
+  second = store.materializeRecord(storeKeys[1]);
+  equals(second.get('status'), SC.Record.READY_CLEAN, 'second record has a READY_CLEAN State');
+});
+
+test("Can Push onto child array",function() {
+  var first, contents;
+  
+  // First
+  first = store.materializeRecord(storeKeys[0]);
+  first = first.get('contents').objectAt(0);
+  contents = first.get('contents');
+  equals(contents.get('length'), 2, "should have two items");
+  contents.forEach(function(f){
+    ok(SC.instanceOf(f, NestedRecord.File), "should be a NestedRecord.File");
+    ok(f.get('name'), "should have a name property");
+  });
+  
+  contents.pushObject({type: 'File', name: 'File 4', id: 12});
+  
+  equals(contents.get('length'), 3, "should have three items");
+  contents.forEach(function(f){
+    ok(SC.instanceOf(f, NestedRecord.File), "should be a NestedRecord.File");
+    ok(f.get('name'), "should have a name property");
+    equals(f.get('status'), SC.Record.READY_DIRTY, 'second record has a READY_CLEAN State');
+    
+  });
+
+});
+
+test("Use in Nested Store", function(){
+  var nstore, dir, c, file,
+      pk, id, nFile, nDir;
+  
+  // First, find the first file
+  dir = store.find(NestedRecord.Directory, 1);
+  ok(dir, "Directory id:1 exists"); 
+  equals(dir.get('name'), 'Dir 1', "Directory id:1 has a name of 'Dir 1'");
+  c = dir.get('contents');
+  ok(c, "Content of Directory id:1 exists");
+  dir = c.objectAt(0);
+  ok(dir, "Directory id:2 exists"); 
+  equals(dir.get('name'), 'Dir 2', "Directory id:2 has a name of 'Dir 2'");
+  c = dir.get('contents');
+  ok(c, "Content of Directory id:2 exists");
+  file = c.objectAt(0);
+  ok(file, "File id:1 exists"); 
+  equals(file.get('name'), 'File 1', "File id:1 has a name of 'File 1'");
+  
+  // Second, create nested store
+  nstore = store.chain();
+  SC.RunLoop.begin();
+  pk = file.get('primaryKey');
+  id = file.get(pk);
+  nFile = nstore.find(NestedRecord.File, id);
+  SC.RunLoop.end();
+  ok(nFile, "Nested > File id:1 exists"); 
+  equals(nFile.get('name'), 'File 1', "Nested > File id:1 has a name of 'File 1'");
+  
+  // Third, change the name of the nested store and see what happens
+  nFile.set('name', 'Change Name');
+  equals(nFile.get('name'), 'Change Name', "Nested > File id:1 has changed the name to 'Changed Name'");
+  equals(file.get('name'), 'File 1', "Base > File id:1 still has the name of 'File 1'");
+  nDir = nstore.find(NestedRecord.Directory, 1);
+  
+  // Fourth, commit the changes
+  nstore.commitChanges();
+  nstore.destroy();
+  nstore = null;
+  equals(file.get('name'), 'Change Name', "Base > File id:1 has changed to name of 'Changed Name'");
+  
+  // Fifth, double check that the change exists
+  dir = store.find(NestedRecord.Directory, 1);
+  file = dir.get('contents').objectAt(0).get('contents').objectAt(0);
+  equals(dir.get('status'), SC.Record.READY_DIRTY, 'Base > Directory id:1 has a READY_DIRTY State');
+  equals(file.get('status'), SC.Record.READY_DIRTY, 'Base > File id:1 has a READY_DIRTY State');
+  equals(file.get('name'), 'Change Name', "Base > File id:1 has actually changed to name of 'Changed Name'");
+  
+});

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record.js

@@ -1,5 +1,5 @@
 /**
- * Nested Records (SC.ChildRecord) Unit Test
+ * Nested Records (SC.Record) Unit Test
  *
  * @author Evin Grano
  */
@@ -12,13 +12,13 @@ var NestedRecord, store, testParent, testParent2, childData1;
 var initModels = function(){
   NestedRecord.ParentRecordTest = SC.Record.extend({
     /** Child Record Namespace */
-    childRecordNamespace: NestedRecord,
+    nestedRecordNamespace: NestedRecord,
 
     name: SC.Record.attr(String),
     info: SC.Record.toOne('NestedRecord.ChildRecordTest', { nested: true })
   });
 
-  NestedRecord.ChildRecordTest = SC.ChildRecord.extend({
+  NestedRecord.ChildRecordTest = SC.Record.extend({
     id: SC.Record.attr(String),
     name: SC.Record.attr(String),
     value: SC.Record.attr(String)
@@ -44,7 +44,7 @@ module("Basic SC.Record Functions w/ Parent > Child", {
         type: 'ChildRecordTest',
         name: 'Child Name',
         value: 'Blue Goo',
-        id: '5001'
+        guid: '5001'
       }
     });
     // Test parent 2
@@ -54,7 +54,7 @@ module("Basic SC.Record Functions w/ Parent > Child", {
         type: 'ChildRecordTest',
         name: 'Child Name 2',
         value: 'Purple Goo',
-        id: '5002'
+        guid: '5002'
       }
     });
     SC.RunLoop.end();
@@ -67,7 +67,7 @@ module("Basic SC.Record Functions w/ Parent > Child", {
       type: 'ChildRecordTest',
       name: 'Child Name',
       value: 'Green Goo',
-      id: '5002'
+      guid: '5002'
     };
   },
 
@@ -92,7 +92,7 @@ test("Function: readAttribute()", function() {
       type: 'ChildRecordTest',
       name: 'Child Name',
       value: 'Blue Goo',
-      id: '5001'
+      guid: '5001'
     },
     "readAttribute should be correct for info child attribute");
   
@@ -105,7 +105,7 @@ test("Support Multiple Parent Records With Different Child Records", function()
       type: 'ChildRecordTest',
       name: 'Child Name 2',
       value: 'Purple Goo',
-      id: '5002'
+      guid: '5002'
     },
     "readAttribute should be correct for info child attribute on new record");
   equals(testParent2.get('info').get('value'), 'Purple Goo', "get should retrieve the proper value on new record");
@@ -115,7 +115,7 @@ test("Support Multiple Parent Records With Different Child Records", function()
       type: 'ChildRecordTest',
       name: 'Child Name',
       value: 'Blue Goo',
-      id: '5001'
+      guid: '5001'
     },
     "readAttribute should be correct for info child attribute on first record");
   equals(testParent.get('info').get('value'), 'Blue Goo', "get should retrieve the proper value on first record");
@@ -152,7 +152,7 @@ test("Basic Read", function() {
   // Test Child Record creation
   var cr = testParent.get('info');
   // Check Model Class information
-  ok(SC.kindOf(cr, SC.ChildRecord), "get() creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(cr, SC.Record), "get() creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest), "get() creates an actual instance of a ChildRecordTest Object");
   
   // Check reference information
@@ -171,13 +171,9 @@ test("Basic Read", function() {
   var oldKey = cr.get(pm), newKey = sameCR.get(pm);
   equals(oldKey, newKey, "check to see if the Primary Key are the same");
   same(sameCR, cr, "check to see that it is the same child record as before");
-  
-  // ID check
-  id = sameCR.get('id');
-  ok((id !== oldKey), "if there is an id param, it should be different from the Primary Key: %@ != %@".fmt(id, oldKey));
 });
 
-test("Basic Write", function() {
+test("Basic Write As a Hash", function() {
   
   // Test general gets
   testParent.set('name', 'New Parent Name');
@@ -190,11 +186,12 @@ test("Basic Write", function() {
   testParent.set('info', {
     type: 'ChildRecordTest',
     name: 'New Child Name',
-    value: 'Red Goo'
+    value: 'Red Goo',
+    guid: '6001'
   });
   var cr = testParent.get('info');
   // Check Model Class information
-  ok(SC.kindOf(cr, SC.ChildRecord), "set() with an object creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(cr, SC.Record), "set() with an object creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest), "set() with an object creates an actual instance of a ChildRecordTest Object");
   
   // Check reference information
@@ -216,6 +213,47 @@ test("Basic Write", function() {
   same(testParent.readAttribute('info'), cr.get('attributes'), "after a set('name', <new>) on child, readAttribute on the parent should be correct for info child attributes");
 });
 
+test("Basic Write As a Child Record", function() {
+  
+  // Test general gets
+  testParent.set('name', 'New Parent Name');
+  equals(testParent.get('name'), 'New Parent Name', "set() should change name attribute");
+  testParent.set('nothing', 'nothing');
+  equals(testParent.get('nothing'), 'nothing', "set should change non-existent property to a new property");
+  
+  // Test Child Record creation
+  var store = testParent.get('store');
+  var cr = store.createRecord(NestedRecord.ChildRecordTest, {type: 'ChildRecordTest', name: 'New Child Name', value: 'Red Goo', guid: '6001'});
+  // Check Model Class information
+  ok(SC.kindOf(cr, SC.Record), "before the set(), check for actual instance that is a kind of a SC.Record Object");
+  ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest), "before the set(), check for actual instance of a ChildRecordTest Object");
+  testParent.set('info', cr);
+  cr = testParent.get('info');
+  // Check Model Class information
+  ok(SC.kindOf(cr, SC.Record), "set() with an object creates an actual instance that is a kind of a SC.Record Object");
+  ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest), "set() with an object creates an actual instance of a ChildRecordTest Object");
+  
+  // Check reference information
+  var pm = cr.get('primaryKey');
+  var key = cr.get(pm);
+  var storeRef = store.find(NestedRecord.ChildRecordTest, key);
+  ok(storeRef, 'after a set() with an object, checking that the store has the instance of the child record with proper primary key');
+  equals(cr, storeRef, "after a set with an object, checking the parent reference is the same as the direct store reference");
+  
+  // Check for changes on the child bubble to the parent.
+  cr.set('name', 'Child Name Change');
+  equals(cr.get('name'), 'Child Name Change', "after a set('name', <new>) on child, checking that the value is updated");
+  ok(cr.get('status') & SC.Record.DIRTY, 'check that the child record is dirty');
+  ok(testParent.get('status') & SC.Record.DIRTY, 'check that the parent record is dirty');
+  var newCR = testParent.get('info');
+  same(newCR, cr, "after a set('name', <new>) on child, checking to see that the parent has recieved the changes from the child record");
+  same(testParent.readAttribute('info'), cr.get('attributes'), "after a set('name', <new>) on child, readAttribute on the parent should be correct for info child attributes");
+
+  // Make sure you can set the child to null.
+  testParent.set('info', null);
+  equals(testParent.get('info'), null, 'should be able to set child record to null');
+});
+
 test("Child Status Changed", function() {
   var cr;
   cr = testParent.get('info');
@@ -272,4 +310,4 @@ test("Child Status Matches Store Status", function() {
   equals(testParent.get('status'), SC.Record.BUSY_REFRESH, 'parent status should be BUSY_REFRESH');
   equals(storeStatus, cr.get('status'), 'after setting the parent to BUSY_REFRESH, the child\'s status and store status should be BUSY_REFRESH before calling get(\'status\') on the child');
   equals(cr.get('status'), testParent.get('status'), 'after setting the parent to BUSY_REFRESH, check that the child record matches');
-});
+});

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_array.js

@@ -1,5 +1,5 @@
 /**
- * Nested Record Array of SC.ChildRecords Unit Test
+ * Nested Record Array of SC.Records Unit Test
  *
  * @author Evin Grano
  */
@@ -12,18 +12,18 @@ var NestedRecord, store, testParent, testParent2;
 var initModels = function(){
   NestedRecord.ParentRecordTest = SC.Record.extend({
     /** Child Record Namespace */
-    childRecordNamespace: NestedRecord,
+    nestedRecordNamespace: NestedRecord,
 
     name: SC.Record.attr(String),
-    elements: SC.Record.toMany('SC.ChildRecord', { nested: true })
+    elements: SC.Record.toMany('SC.Record', { nested: true })
   });
 
-  NestedRecord.ChildRecordTest1 = SC.ChildRecord.extend({
+  NestedRecord.ChildRecordTest1 = SC.Record.extend({
     name: SC.Record.attr(String),
     value: SC.Record.attr(String)
   });
   
-  NestedRecord.ChildRecordTest2 = SC.ChildRecord.extend({
+  NestedRecord.ChildRecordTest2 = SC.Record.extend({
      name: SC.Record.attr(String),
      info: SC.Record.attr(String),
      value: SC.Record.attr(String)
@@ -160,7 +160,7 @@ test("Basic Read", function() {
   ok(SC.instanceOf(arrayOfCRs, SC.ChildArray), "check that get() creates an actual instance of a SC.ChildArray");
   equals(arrayOfCRs.get('length'), 4, "check that the length of the array of child records is 4");
   var cr = arrayOfCRs.objectAt(0);
-  ok(SC.kindOf(cr, SC.ChildRecord), "check that first ChildRecord from the get() creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(cr, SC.Record), "check that first ChildRecord from the get() creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest1), "check that first ChildRecord from the get() creates an actual instance of a ChildRecordTest1 Object");
   
   // Check reference information
@@ -209,7 +209,7 @@ test("Basic Write", function() {
   equals(newArray.get('length'), 3, "after set() on parent, check that the length of the array of child records is 3");
   var cr = newArray.objectAt(0);
 
-  ok(SC.kindOf(cr, SC.ChildRecord), "check that first ChildRecord from the get() creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(cr, SC.Record), "check that first ChildRecord from the get() creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest1), "check that first ChildRecord from the get() creates an actual instance of a ChildRecordTest1 Object");
 });
 
@@ -241,7 +241,7 @@ test("Basic Write: reference tests", function() {
    same(readAttrsArray[0], newCR.get('attributes'), "after a set('name', <new>) on child, readAttribute on the parent should be correct for info child attributes");
 });
 
-test("Basic Array Functionality: pushObject", function() {   
+test("Basic Array Functionality: pushObject w/ HASH", function() {   
   var elements, elementsAttrs, cr, crFirst, crLast;
   // Add something to the array
   elements = testParent.get('elements');
@@ -250,7 +250,7 @@ test("Basic Array Functionality: pushObject", function() {
   elements = testParent.get('elements');
   equals(elements.get('length'), 5, "after pushObject() on parent, check that the length of the array of child records is 5");
   cr = elements.objectAt(4);
-  ok(SC.kindOf(cr, SC.ChildRecord), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(cr, SC.Record), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest1), "check that newly added ChildRecord creates an actual instance of a ChildRecordTest1 Object");
   equals(cr.get('name'), 'Testikles', "after a pushObject on parent, check to see if it has all the right values for the attributes");
   ok(cr.get('status') & SC.Record.DIRTY, 'check that the child record is dirty');
@@ -265,6 +265,32 @@ test("Basic Array Functionality: pushObject", function() {
   same(elementsAttrs[4], crLast, "verify that parent attributes are the same as the last individual child attributes");  
 });
 
+test("Basic Array Functionality: pushObject w/ ChildRecord", function() {   
+  var elements, elementsAttrs, cr, crFirst, crLast;
+  // Add something to the array
+  elements = testParent.get('elements');
+  // PushObject Tests
+  cr = store.createRecord(NestedRecord.ChildRecordTest1, { type: 'ChildRecordTest1', name: 'Testikles', value: 'God Of Fertility'});
+  elements.pushObject(cr);
+  elements = testParent.get('elements');
+  equals(elements.get('length'), 5, "after pushObject() on parent, check that the length of the array of child records is 5");
+  cr = elements.objectAt(4);
+  ok(SC.kindOf(cr, SC.Record), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.Record Object");
+  ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest1), "check that newly added ChildRecord creates an actual instance of a ChildRecordTest1 Object");
+  equals(cr.get('name'), 'Testikles', "after a pushObject on parent, check to see if it has all the right values for the attributes");
+  ok(cr.get('status') & SC.Record.DIRTY, 'check that the child record is dirty');
+  ok(testParent.get('status') & SC.Record.DIRTY, 'check that the parent record is dirty'); 
+  
+  // Verify the Attrs
+  elementsAttrs = testParent.readAttribute('elements');
+  equals(elementsAttrs.length, 5, "after pushObject() on parent, check that the length of the attribute array of child records is 5");
+  crFirst = elements.objectAt(0).get('attributes');
+  crLast = elements.objectAt(4).get('attributes');
+  same(elementsAttrs[0], crFirst, "verify that parent attributes are the same as the first individual child attributes");
+  same(elementsAttrs[4], crLast, "verify that parent attributes are the same as the last individual child attributes");  
+});
+
+
 test("Basic Array Functionality: popObject", function() {   
   var elements, elementsAttrs, cr, crFirst, crLast;
   // Add something to the array
@@ -304,7 +330,7 @@ test("Basic Array Functionality: unshiftObject", function() {
   elements = testParent.get('elements');
   equals(elements.get('length'), 5, "after pushObject() on parent, check that the length of the array of child records is 5");
   cr = elements.objectAt(0);
-  ok(SC.kindOf(cr, SC.ChildRecord), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(cr, SC.Record), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest1), "check that newly added ChildRecord creates an actual instance of a ChildRecordTest1 Object");
   equals(cr.get('name'), 'Testikles', "after a pushObject on parent, check to see if it has all the right values for the attributes");
   ok(cr.get('status') & SC.Record.DIRTY, 'check that the child record is dirty');