From 81decf8b30a6814f7e0514fdacbadb1368fe306d Mon Sep 17 00:00:00 2001 From: nickw Date: Wed, 2 Jun 2010 20:26:50 +0000 Subject: Requesting annotations from a non-existent subtype will now return nothing instead of everything. This functionality is required to preserve context. git-svn-id: http://code.elgg.org/elgg/trunk@6331 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/tests/objects/entities.php | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'engine/tests/objects/entities.php') diff --git a/engine/tests/objects/entities.php b/engine/tests/objects/entities.php index 1504c2f93..eb6eee2a3 100644 --- a/engine/tests/objects/entities.php +++ b/engine/tests/objects/entities.php @@ -109,16 +109,26 @@ class ElggCoreEntityTest extends ElggCoreUnitTest { $this->assertTrue(array_key_exists('non_existent', $this->entity->expose_annotations())); // save entity and check for annotation + $this->entity->subtype = 'testing'; $this->save_entity(); $this->assertFalse(array_key_exists('non_existent', $this->entity->expose_annotations())); $annotations = $this->entity->getAnnotations('non_existent'); $this->assertIsA($annotations[0], 'ElggAnnotation'); $this->assertIdentical($annotations[0]->name, 'non_existent'); $this->assertEqual($this->entity->countAnnotations('non_existent'), 1); + + $this->assertIdentical($annotations, get_annotations($this->entity->getGUID())); + $this->assertIdentical($annotations, get_annotations($this->entity->getGUID(), 'site')); + $this->assertIdentical($annotations, get_annotations($this->entity->getGUID(), 'site', 'testing')); + $this->assertIdentical(FALSE, get_annotations($this->entity->getGUID(), 'site', 'fail')); // clear annotation $this->assertTrue($this->entity->clearAnnotations()); $this->assertEqual($this->entity->countAnnotations('non_existent'), 0); + + $this->assertIdentical(FALSE, get_annotations($this->entity->getGUID())); + $this->assertIdentical(FALSE, get_annotations($this->entity->getGUID(), 'site')); + $this->assertIdentical(FALSE, get_annotations($this->entity->getGUID(), 'site', 'testing')); // clean up $this->assertTrue($this->entity->delete()); -- cgit v1.2.3