From 6a14f37b74eeb725ba12d9fa1b1d1aad1801222f Mon Sep 17 00:00:00 2001
From: euromark <euromark@web.de>
Date: Fri, 16 Aug 2013 20:55:17 +0200
Subject: [PATCH] a few more orders in test case corrected

---
 lib/Cake/Test/Case/Utility/FileTest.php | 12 ++++++------
 lib/Cake/Test/Case/Utility/HashTest.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Cake/Test/Case/Utility/FileTest.php b/lib/Cake/Test/Case/Utility/FileTest.php
index 26958a8db3d..5e72c1b912a 100644
--- a/lib/Cake/Test/Case/Utility/FileTest.php
+++ b/lib/Cake/Test/Case/Utility/FileTest.php
@@ -217,19 +217,19 @@ public function testOffset() {
 		$this->assertTrue(is_resource($this->File->handle));
 
 		$result = $this->File->offset();
-		$expecting = 0;
-		$this->assertSame($result, $expecting);
+		$expected = 0;
+		$this->assertSame($expected, $result);
 
 		$data = file_get_contents(__FILE__);
 		$success = $this->File->offset(5);
-		$expecting = substr($data, 5, 3);
+		$expected = substr($data, 5, 3);
 		$result = $this->File->read(3);
 		$this->assertTrue($success);
-		$this->assertEquals($expecting, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->File->offset();
-		$expecting = 5 + 3;
-		$this->assertSame($result, $expecting);
+		$expected = 5 + 3;
+		$this->assertSame($expected, $result);
 	}
 
 /**
diff --git a/lib/Cake/Test/Case/Utility/HashTest.php b/lib/Cake/Test/Case/Utility/HashTest.php
index 1e8cc208c2d..fb1b6fc90d0 100644
--- a/lib/Cake/Test/Case/Utility/HashTest.php
+++ b/lib/Cake/Test/Case/Utility/HashTest.php
@@ -2209,7 +2209,7 @@ public function testExpand() {
 				)
 			)
 		);
-		$this->assertEquals($result, $expected);
+		$this->assertEquals($expected, $result);
 
 		$data = array('a.b.100.a' => null, 'a.b.200.a' => null);
 		$expected = array(