Changeset 328

Timestamp:

08/27/07 20:10:14 (1 year ago)

Author:

bermiferrer

Message:

Adding more tests for habtm and has_many associations. Fixed invalid associate selection when removing more than one associated.

Files:

• trunk/lib/AkActiveRecord/AkHasAndBelongsToMany.php (modified) (1 diff)
• trunk/lib/AkActiveRecord/AkHasMany.php (modified) (7 diffs)
• trunk/script/test (modified) (2 diffs)
• trunk/test/fixtures/app/installers/comment_installer.php (modified) (1 diff)
• trunk/test/fixtures/app/installers/post_installer.php (modified) (1 diff)
• trunk/test/fixtures/app/models/post.php (modified) (1 diff)
• trunk/test/fixtures/app/models/tag.php (modified) (1 diff)
• trunk/test/unit/lib/AkActiveRecord/AkHasAndBelongsToMany.php (modified) (6 diffs)
• trunk/test/unit/lib/AkActiveRecord/AkHasMany.php (modified) (4 diffs)

trunk/lib/AkActiveRecord/AkHasAndBelongsToMany.php

@@ -440 +440 @@
-
-                if(!in_array($id, $ids_to_skip)){
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                    }
-                }

trunk/lib/AkActiveRecord/AkHasMany.php

@@ -252 +252 @@
-        $ids = func_get_args();
-        $ids = is_array($ids[0]) ? $ids[0] : $ids;
+        
-        $AssociatedModel =& $this->getAssociatedModelInstance();
-        if(!empty($ids)){
@@ -314 +315 @@
-                        break;
-                        case 'nullify':
-
+
+
+
+
-                        default:
-                        break;
@@ -321 +325 @@
-            }
-
+            $ids_to_nullify = empty($ids_to_nullify) ? false : array_diff($ids_to_nullify,array(''));
-            if(!empty($ids_to_nullify)){
-                $success = $AssociatedModel->updateAll(
@@ -399 +404 @@
-            $Member->__hasManyMemberId = Ak::randomString();
-        }
-$Member->getId()
+method_exists($Member,'getId') ? $Member->getId() : null
-        if(!empty($object_id)){
-            $this->asssociated_ids[$object_id] = $Member->__hasManyMemberId;
@@ -429 +434 @@
-    {
-        if(!$this->Owner->isNewRecord()){
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-        return false;
@@ -710 +717 @@
-
-                        case 'nullify':
-
+
+
+
+
-                        break;
-
@@ -717 +727 @@
-                    }
-                }
-
+
+
-                if(!empty($ids_to_nullify)){
-                    $success = $object->{$k}[$key]->updateAll(
-                    ' '.$object->$v->options[$k]['foreign_key'].' = NULL ',
-
+ 
-                    ) ? $success : false;
-                }elseif(!empty($ids_to_delete)){

trunk/script/test

@@ -22 +22 @@
-
-defined('AK_TEST_DATABASE_ON') ? null : define('AK_TEST_DATABASE_ON', true);
+defined('AK_ACTIVE_RECORD_PROTECT_GET_RECURSION') ? null : define('AK_ACTIVE_RECORD_PROTECT_GET_RECURSION', false);
+
-require_once(dirname(__FILE__).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'test'.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php');
-
@@ -42 +44 @@
-                    if(!preg_match('/^('.join('|',$____skip_tests).')$/i',$match[1])){
-                        $____skip_tests[] = $match[1];
-                        Ak::trace(join(',',$____skip_tests));
-                        ak_test($match[1].'TestCase', true);
-                    }

trunk/test/fixtures/app/installers/comment_installer.php

@@ -14 +14 @@
-    function down_1()
-    {
-
+, array('sequence'=>true)
-    }
-    

trunk/test/fixtures/app/installers/post_installer.php

@@ -10 +10 @@
-    function uninstall()
-    {
-
+, array('sequence'=>true)
-    }
-}

trunk/test/fixtures/app/models/post.php

@@ -4 +4 @@
-{
-    var $has_many = 'comments';
+    var $habtm = 'tags';
-}
-

trunk/test/fixtures/app/models/tag.php

@@ -7 +7 @@
-            'join_table' => 'taggings',
-            'join_class_name' => 'Tagging'
-
+
+
-    );
-    

trunk/test/unit/lib/AkActiveRecord/AkHasAndBelongsToMany.php

@@ -1 +1 @@
-<?php
-
-
-
-
-
-
-
-
-
-
+
-{
+    function setup()
+    {
+        $this->installAndIncludeModels(array('Post', 'Tag'));
+        $Installer = new AkInstaller();
+        @$Installer->dropTable('posts_tags');
+        @Ak::file_delete(AK_MODELS_DIR.DS.'post_tag.php');
+    }
+    /**/
-    function test_start()
-    {
@@ -22 +22 @@
-        $installer->uninstall();
-        $installer->install();
+        
+        
-        $models = array('Picture', 'Thumbnail','Panorama', 'Property', 'PropertyType');
-        foreach ($models as $model){
@@ -98 +100 @@
-        $this->assertEqual($Property->property_type->count(), 1);
-
-$Property = $Property->findFirstBy('description','Gandia Palace');
-
-
-
-
+
+
+&
+
+&
-
-        $Property->property_type->set($PropertyTypes);
@@ -108 +110 @@
-        $this->assertEqual($Property->property_type->count(), count($PropertyTypes));
-
-
+&
-
-        $Property->property_type->load();
-        $this->assertEqual($Property->property_type->count(), count($PropertyTypes));
-
-
+&
-
-        $PropertyType->set('description', 'Palace');
+
-        $Property->property_type->set($PropertyType);
-
-        $this->assertEqual($Property->property_type->count(), 1);
-
+
-        $this->assertTrue(in_array('property_types', $Property->getAssociatedIds()));
-
@@ -224 +227 @@
-
-    }
-
-
+
-    function test_find_on_unsaved_models_including_associations()
-    {
@@ -404 +406 @@
-
-    }
+
+
+    function test_remove_existing_associates_before_setting_by_id()
+    {
+
+        foreach (range(1,10) as $i){
+            $Post =& new Post(array('title' => 'Post '.$i));
+            $Post->tag->create(array('name' => 'Tag '.$i));
+            $Post->save();
+            $this->assertEqual($Post->tag->count(), 1);
+        }
+
+        $Post11 =& new Post(array('name' => 'Post 11'));
+        $this->assertTrue($Post11->save());
+
+        $Post->tag->setByIds(1,2,3,4,5);
+        
+        $this->assertTrue($Post =& $Post->find(10, array('include' => 'tags')));
+
+        foreach (array_keys($Post->tags) as $k){
+            $this->assertEqual($Post->tags[$k]->getId(), $k+1);
+        }
+        
+        // Tag 10 should exist but unrelated to a post
+        $this->assertTrue($Tag =& $Post->tags[$k]->find(10));
+        $this->assertEqual($Tag->post->count(), 0);
+
+        $Post11->tag->setByIds(array(10,1));
+
+        $this->assertTrue($Tag =& $Tag->find(10, array('include'=>'posts')));
+        $this->assertEqual($Tag->posts[0]->getId(), 11);
+
+
+    }
+    /**//** //**/
-}
-
-ak_test('test_AkActiveRecord_hasAndBelongsToMany_Associations', true);
-
-?>

trunk/test/unit/lib/AkActiveRecord/AkHasMany.php

@@ -1 +1 @@
-<?php
-
-
-
-
-
-
-
-
-
-
+
-{
-
+
-    function test_start()
-    {
@@ -35 +27 @@
-    }
-
-    /**/
-    function test_for_has_many()
-    {
@@ -213 +204 @@
-    }
-
-    /**/
-
-    function test_clean_up_dependencies()
-    {
@@ -273 +262 @@
-        $this->assertEqual($Result->comments[0]->get('name'), 'Aditya');
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-ak_test('test_AkActiveRecord_hasMany_Associations', true);
-
-
-?>