aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/entities.php2
-rw-r--r--engine/tests/core/entities.php65
-rwxr-xr-xengine/tests/elgg_unit_test.php2
-rw-r--r--engine/tests/test_skeleton.php11
4 files changed, 50 insertions, 30 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index a73dde60c..aadbdc835 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -2775,7 +2775,7 @@
*/
function entities_test($hook, $type, $value, $params) {
global $CONFIG;
- $params[] = $CONFIG->path . 'engine/tests/entities.php';
+ $params[] = $CONFIG->path . 'engine/tests/core/entities.php';
return $params;
}
diff --git a/engine/tests/core/entities.php b/engine/tests/core/entities.php
index e8013b1fc..37960c3af 100644
--- a/engine/tests/core/entities.php
+++ b/engine/tests/core/entities.php
@@ -1,52 +1,73 @@
<?php
/**
* Elgg Test ElggEntities
- *
+ *
* @package Elgg
* @subpackage Test
* @author Curverider Ltd
* @link http://elgg.org/
*/
class ElggCoreEntityTest extends ElggCoreUnitTest {
-
- /**
- * Called before each test object.
- */
- public function __construct() {
-
- }
-
/**
* Called before each test method.
*/
public function setUp() {
-
-
+ $this->entity = new ElggEntityTest();
}
/**
* Called after each test method.
*/
public function tearDown() {
-
-
+ unset($this->entity);
}
/**
- * Called after each test object.
+ * Tests the protected attributes
*/
- public function __destruct() {
-
+ public function testElggEntityAttributes() {
+ $test_attributes = array();
+ $test_attributes['guid'] = '';
+ $test_attributes['type'] = '';
+ $test_attributes['subtype'] = '';
+ $test_attributes['owner_guid'] = get_loggedin_userid();
+ $test_attributes['container_guid'] = get_loggedin_userid();
+ $test_attributes['site_guid'] = 0;
+ $test_attributes['access_id'] = ACCESS_PRIVATE;
+ $test_attributes['time_created'] = '';
+ $test_attributes['time_updated'] = '';
+ $test_attributes['enabled'] = 'yes';
+ $test_attributes['tables_split'] = 1;
+ $test_attributes['tables_loaded'] = 0;
+ $this->assertIdentical($this->entity->expose_attributes(), $test_attributes);
}
- /**
- * A basic test that will be called and fail.
- */
- public function testElggEntityConstructor() {
- $this->assertTrue(FALSE);
+ public function testElggEntityGetAndSet() {
+ $this->assertIdentical($this->entity->get('access_id'), ACCESS_PRIVATE);
+ $this->assertTrue($this->entity->set('access_id', ACCESS_PUBLIC));
+ $this->assertIdentical($this->entity->get('access_id'), ACCESS_PUBLIC);
+ $this->assertIdentical($this->entity->access_id, ACCESS_PUBLIC);
+ unset($this->entity->access_id);
+ $this->assertIdentical($this->entity->access_id, '');
+
+ $this->assertFalse($this->entity->set('guid', 'error'));
+
+ $this->assertNull($this->entity->get('non_existent'));
+ $this->assertFalse(isset($this->entity->non_existent));
+ $this->assertTrue($this->entity->non_existent = 'test');
+ $this->assertTrue(isset($this->entity->non_existent));
+ $this->assertIdentical($this->entity->non_existent, 'test');
}
}
// ElggEntity is an abstract class with no abstact methods.
-class ElggEntityTest extends ElggEntity { }
+class ElggEntityTest extends ElggEntity {
+ public function __construct() {
+ $this->initialise_attributes();
+ }
+
+ public function expose_attributes() {
+ return $this->attributes;
+ }
+}
diff --git a/engine/tests/elgg_unit_test.php b/engine/tests/elgg_unit_test.php
index 79c3d375c..d9841099b 100755
--- a/engine/tests/elgg_unit_test.php
+++ b/engine/tests/elgg_unit_test.php
@@ -6,7 +6,7 @@ abstract class ElggCoreUnitTest extends UnitTestCase
{
parent::__construct();
}
-
+
public function __destruct()
{
}
diff --git a/engine/tests/test_skeleton.php b/engine/tests/test_skeleton.php
index b958e7b25..494887bc2 100644
--- a/engine/tests/test_skeleton.php
+++ b/engine/tests/test_skeleton.php
@@ -1,7 +1,7 @@
<?php
/**
* Elgg Test Skeleton
- *
+ *
* @package Elgg
* @subpackage Test
* @author Curverider Ltd
@@ -13,14 +13,14 @@ class ElggCoreSkeletonTest extends ElggCoreUnitTest {
* Called before each test object.
*/
public function __construct() {
-
+ // first, hook into ElggCoreUnitTest::__construct()
+ $this->__construct();
}
/**
* Called before each test method.
*/
public function setUp() {
-
}
@@ -29,15 +29,14 @@ class ElggCoreSkeletonTest extends ElggCoreUnitTest {
*/
public function tearDown() {
-
}
/**
* Called after each test object.
*/
public function __destruct() {
-
-
+ // hook into ElggCoreUnitTest::__destruct();
+ $this->__destruct();
}
/**