Refs #2597 - fixes some unit tests broken in the reorg of the data models

git-svn-id: http://code.elgg.org/elgg/trunk@7165 36083f99-b078-4883-b0ff-0f9b5a30f544

4 files changed, 20 insertions, 4 deletions

diff --git a/engine/tests/objects/entities.php b/engine/tests/objects/entities.php
index e147c0a3c..018f7aa02 100644
--- a/engine/tests/objects/entities.php
+++ b/engine/tests/objects/entities.php
@@ -39,8 +39,12 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 		$test_attributes['enabled'] = 'yes';
 		$test_attributes['tables_split'] = 1;
 		$test_attributes['tables_loaded'] = 0;
+		ksort($test_attributes);
 
-		$this->assertIdentical($this->entity->expose_attributes(), $test_attributes);
+		$entity_attributes = $this->entity->expose_attributes();
+		ksort($entity_attributes);
+
+		$this->assertIdentical($entity_attributes, $test_attributes);
 	}
 
 	public function testElggEntityGetAndSetBaseAttributes() {
diff --git a/engine/tests/objects/objects.php b/engine/tests/objects/objects.php
index b17165a3d..40c3c635a 100644
--- a/engine/tests/objects/objects.php
+++ b/engine/tests/objects/objects.php
@@ -53,8 +53,12 @@ class ElggCoreObjectTest extends ElggCoreUnitTest {
 		$attributes['tables_loaded'] = 0;
 		$attributes['title'] = '';
 		$attributes['description'] = '';
+		ksort($attributes);
 
-		$this->assertIdentical($this->entity->expose_attributes(), $attributes);
+		$entity_attributes = $this->entity->expose_attributes();
+		ksort($entity_attributes);
+
+		$this->assertIdentical($entity_attributes, $attributes);
 	}
 
 	public function testElggObjectSave() {
diff --git a/engine/tests/objects/sites.php b/engine/tests/objects/sites.php
index 7a9198fc2..a411f368c 100644
--- a/engine/tests/objects/sites.php
+++ b/engine/tests/objects/sites.php
@@ -57,8 +57,12 @@ class ElggCoreSiteTest extends ElggCoreUnitTest {
 		$attributes['name'] = '';
 		$attributes['description'] = '';
 		$attributes['url'] = '';
+		ksort($attributes);
 
-		$this->assertIdentical($this->site->expose_attributes(), $attributes);
+		$entity_attributes = $this->entity->expose_attributes();
+		ksort($entity_attributes);
+
+		$this->assertIdentical($entity_attributes, $attributes);
 	}
 
 	public function testElggSiteSaveAndDelete() {
diff --git a/engine/tests/objects/users.php b/engine/tests/objects/users.php
index b6ba9ea4d..baf03d0fe 100644
--- a/engine/tests/objects/users.php
+++ b/engine/tests/objects/users.php
@@ -68,8 +68,12 @@ class ElggCoreUserTest extends ElggCoreUnitTest {
 		$attributes['code'] = '';
 		$attributes['banned'] = 'no';
 		$attributes['admin'] = 'no';
+		ksort($attributes);
 
-		$this->assertIdentical($this->user->expose_attributes(), $attributes);
+		$entity_attributes = $this->entity->expose_attributes();
+		ksort($entity_attributes);
+
+		$this->assertIdentical($entity_attributes, $attributes);
 	}
 
 	public function testElggUserLoad() {