]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Fixes #3946 deleting the temporary entities created in entity unit tests
authorCash Costello <cash.costello@gmail.com>
Sun, 9 Oct 2011 02:35:01 +0000 (22:35 -0400)
committerCash Costello <cash.costello@gmail.com>
Sun, 9 Oct 2011 02:35:01 +0000 (22:35 -0400)
engine/tests/objects/entities.php

index c0a7b96b396e35b0f2b625c402d2f93ca15478eb..49b1764bc56299e14528af6a05f9feb1a4633f7b 100644 (file)
@@ -278,6 +278,10 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
                        $this->entity->$name = $md;
 
                        $this->assertEqual($md, $this->entity->$name);
+
+                       if ($save) {
+                               $this->assertTrue($this->entity->delete());
+                       }
                }
        }
 
@@ -292,6 +296,10 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
                        $this->entity->$name = $md;
 
                        $this->assertEqual($md[0], $this->entity->$name);
+
+                       if ($save) {
+                               $this->assertTrue($this->entity->delete());
+                       }
                }
        }
 
@@ -307,6 +315,10 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
                        $this->entity->setMetaData($name, 'test2', '', true);
 
                        $this->assertEqual(array('test', 'test2'), $this->entity->$name);
+
+                       if ($save) {
+                               $this->assertTrue($this->entity->delete());
+                       }
                }
        }
 
@@ -322,6 +334,10 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
                        $this->entity->setMetaData($name, array('test2'), '', true);
 
                        $this->assertEqual(array('test', 'test2'), $this->entity->$name);
+
+                       if ($save) {
+                               $this->assertTrue($this->entity->delete());
+                       }
                }
        }
 
@@ -338,11 +354,14 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
                        $this->entity->setMetaData($name, $md2, '', true);
 
                        $this->assertEqual(array_merge($md, $md2), $this->entity->$name);
+
+                       if ($save) {
+                               $this->assertTrue($this->entity->delete());
+                       }
                }
        }
 
-       protected function save_entity($type='site')
-       {
+       protected function save_entity($type='site') {
                $this->entity->type = $type;
                $this->assertNotEqual($this->entity->save(), 0);
        }