From: Andreas Fischer <bantu@owncloud.com>
Date: Thu, 12 Sep 2013 20:52:14 +0000 (+0200)
Subject: Compare objects directly. Also use $expected and $actual.
X-Git-Tag: v6.0.0alpha2~170^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=20b799b2b49ab301e744d2caab239a278df92ce6;p=nextcloud-server.git

Compare objects directly. Also use $expected and $actual.
---

diff --git a/tests/lib/db.php b/tests/lib/db.php
index befb52ee198..c87bee4ab99 100644
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@ -155,10 +155,10 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 		$column = 'timestamptest';
 
 		$expectedFormat = 'Y-m-d H:i:s';
-		$now = new \DateTime;
+		$expected = new \DateTime;
 
 		$query = OC_DB::prepare("INSERT INTO `$table` (`$column`) VALUES (?)");
-		$result = $query->execute(array($now->format($expectedFormat)));
+		$result = $query->execute(array($expected->format($expectedFormat)));
 		$this->assertEquals(
 			1,
 			$result,
@@ -170,16 +170,16 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 		$result = $query->execute(array($id));
 		$row = $result->fetchRow();
 
-		$dateFromDb = \DateTime::createFromFormat($expectedFormat, $row[$column]);
+		$actual = \DateTime::createFromFormat($expectedFormat, $row[$column]);
 		$this->assertInstanceOf(
 			'\DateTime',
-			$dateFromDb,
+			$actual,
 			"Database failed to return dates in the format '$expectedFormat'."
 		);
 
 		$this->assertEquals(
-			$now->format('c u'),
-			$dateFromDb->format('c u'),
+			$expected,
+			$actual,
 			'Failed asserting that the returned date is the same as the inserted.'
 		);
 	}