1 files changed, 32 insertions, 31 deletions

diff --git a/engine/tests/objects/entities.php b/engine/tests/objects/entities.php
index 44d16c852..1504c2f93 100644
--- a/engine/tests/objects/entities.php
+++ b/engine/tests/objects/entities.php
@@ -37,27 +37,28 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 		$test_attributes['access_id'] = ACCESS_PRIVATE;
 		$test_attributes['time_created'] = '';
 		$test_attributes['time_updated'] = '';
+		$test_attributes['last_action'] = '';
 		$test_attributes['enabled'] = 'yes';
 		$test_attributes['tables_split'] = 1;
 		$test_attributes['tables_loaded'] = 0;
 
 		$this->assertIdentical($this->entity->expose_attributes(), $test_attributes);
 	}
-	
+
 	public function testElggEntityGetAndSetBaseAttributes() {
 		// explicitly set and get access_id
 		$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);
-		
+
 		// check internal attributes array
 		$attributes = $this->entity->expose_attributes();
 		$this->assertIdentical($attributes['access_id'], ACCESS_PUBLIC);
-		
+
 		// implicitly set and get access_id
 		$this->entity->access_id = ACCESS_PRIVATE;
 		$this->assertIdentical($this->entity->access_id, ACCESS_PRIVATE);
-		
+
 		// unset access_id
 		unset($this->entity->access_id);
 		$this->assertIdentical($this->entity->access_id, '');
@@ -66,10 +67,10 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 		$this->assertFalse($this->entity->set('guid', 'error'));
 		$this->entity->guid = 'error';
 		$this->assertNotEqual($this->entity->guid, 'error');
-		
+
 		// fail on non-attribute
 		$this->assertNull($this->entity->get('non_existent'));
-		
+
 		// consider helper methods
 		$this->assertIdentical($this->entity->getGUID(), $this->entity->guid );
 		$this->assertIdentical($this->entity->getType(), $this->entity->type );
@@ -79,20 +80,20 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 		$this->assertIdentical($this->entity->getTimeCreated(), $this->entity->time_created );
 		$this->assertIdentical($this->entity->getTimeUpdated(), $this->entity->time_updated );
 	}
-	
+
 	public function testElggEntityGetAndSetMetaData() {
 		// ensure metadata not set
 		$this->assertNull($this->entity->get('non_existent'));
 		$this->assertFalse(isset($this->entity->non_existent));
-		
+
 		// create metadata
 		$this->assertTrue($this->entity->non_existent = 'testing');
-		
+
 		// check metadata set
 		$this->assertTrue(isset($this->entity->non_existent));
 		$this->assertIdentical($this->entity->non_existent, 'testing');
 		$this->assertIdentical($this->entity->getMetaData('non_existent'), 'testing');
-		
+
 		// check internal metadata array
 		$metadata = $this->entity->expose_metadata();
 		$this->assertIdentical($metadata['non_existent'], 'testing');
@@ -114,7 +115,7 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 		$this->assertIsA($annotations[0], 'ElggAnnotation');
 		$this->assertIdentical($annotations[0]->name, 'non_existent');
 		$this->assertEqual($this->entity->countAnnotations('non_existent'), 1);
-		
+
 		//  clear annotation
 		$this->assertTrue($this->entity->clearAnnotations());
 		$this->assertEqual($this->entity->countAnnotations('non_existent'), 0);
@@ -122,22 +123,22 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 		// clean up
 		$this->assertTrue($this->entity->delete());
 	}
-	
+
 	public function testElggEntityCache() {
 		global $ENTITY_CACHE;
 		$ENTITY_CACHE = NULL;
-		
+
 		$this->assertNull($ENTITY_CACHE);
 		initialise_entity_cache();
 		$this->assertIsA($ENTITY_CACHE, 'array');
 	}
-	
+
 	public function testElggEntitySaveAndDelete() {
 		global $ENTITY_CACHE;
-		
+
 		// unable to delete with no guid
 		$this->assertFalse($this->entity->delete());
-		
+
 		// error on save
 		try {
 			$this->entity->save();
@@ -146,53 +147,53 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 			$this->assertIsA($e, 'InvalidParameterException');
 			$this->assertIdentical($e->getMessage(), elgg_echo('InvalidParameterException:EntityTypeNotSet'));
 		}
-		
+
 		// set elements
 		$this->entity->type = 'site';
 		$this->entity->non_existent = 'testing';
-		
+
 		// save
 		$this->AssertEqual($this->entity->getGUID(), 0);
 		$guid = $this->entity->save();
 		$this->AssertNotEqual($guid, 0);
-		
+
 		// check guid
 		$this->AssertEqual($this->entity->getGUID(), $guid);
 		$attributes = $this->entity->expose_attributes();
 		$this->AssertEqual($attributes['guid'], $guid);
 		$this->AssertIdentical($ENTITY_CACHE[$guid], $this->entity);
-		
+
 		// check metadata
 		$metadata = $this->entity->expose_metadata();
 		$this->AssertFalse(in_array('non_existent', $metadata));
 		$this->AssertEqual($this->entity->get('non_existent'), 'testing');
-		
+
 		// clean up with delete
 		$this->assertTrue($this->entity->delete());
 	}
-	
+
 	public function testElggEntityDisableAndEnable() {
 		global $CONFIG;
-		
+
 		// ensure enabled
 		$this->assertTrue($this->entity->isEnabled());
-		
+
 		// false on disable
 		$this->assertFalse($this->entity->disable());
-		
+
 		// save and disable
 		$this->save_entity();
 		$this->assertTrue($this->entity->disable());
-		
+
 		// ensure disabled by comparing directly with database
 		$entity = get_data_row("SELECT * FROM {$CONFIG->dbprefix}entities WHERE guid = '{$this->entity->guid}'");
 		$this->assertIdentical($entity->enabled, 'no');
-		
+
 		// re-enable for deletion to work
 		$this->assertTrue($this->entity->enable());
 		$this->assertTrue($this->entity->delete());
 	}
-	
+
 	public function testElggEntityExportables() {
 		$exportables = array(
 			'guid',
@@ -204,7 +205,7 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 			'owner_guid',
 			'site_guid'
 		);
-		
+
 		$this->assertIdentical($exportables, $this->entity->getExportableValues());
 	}
 
@@ -220,11 +221,11 @@ class ElggEntityTest extends ElggEntity {
 	public function __construct() {
 		$this->initialise_attributes();
 	}
-	
+
 	public function expose_attributes() {
 		return $this->attributes;
 	}
-	
+
 	public function expose_metadata() {
 		return $this->temp_metadata;
 	}