Fixing tests

Finish __clone
joomla · Nov 17, 2011 · da3eaa5 · da3eaa5
1 parent 3202485
commit da3eaa5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/libraries/joomla/database/databasequery.php b/libraries/joomla/database/databasequery.php
@@ -116,9 +116,13 @@ public function getElements()
 	 */
 	public function __clone()
 	{
-		if (is_object($v) || is_array($v))
+		foreach ($this as $k => $v)
 		{
-			$this->{$k} = unserialize(serialize($v));
+
+		if (is_object($v) || is_array($v))
+			{
+				$this->{$k} = unserialize(serialize($v));
+			}
 		}
 	}
 }
@@ -1169,9 +1173,13 @@ public function where($conditions, $glue = 'AND')
 	 */
 	public function __clone()
 	{
-		if (is_object($v) || is_array($v))
+		foreach ($this as $k => $v)
 		{
-			$this->{$k} = unserialize(serialize($v));
+
+			if (is_object($v) || is_array($v))
+			{
+				$this->{$k} = unserialize(serialize($v));
+			}
 		}
 	}
 }
diff --git a/tests/suite/joomla/database/JDatabaseQueryElementTest.php b/tests/suite/joomla/database/JDatabaseQueryElementTest.php
@@ -236,12 +236,14 @@ public function test__clone_array()
 
 		$baseElement = new JDatabaseQueryElement($name = null, $elements = null);
 
-		$baseElement->testArray = array('a', 'b', 'c');
+		$baseElement->testArray = array();
 
 		$cloneElement = clone($baseElement);
 
+		$baseElement->testArray[] = 'a';
+
 		$this->assertFalse($baseElement === $cloneElement);
-		$this->assertFalse($baseElement->testArray === $cloneElement->testArray);
+		$this->assertEquals(count($cloneElement->testArray), 0);
 	}
 
 	/**

diff --git a/tests/suite/joomla/database/JDatabaseQueryTest.php b/tests/suite/joomla/database/JDatabaseQueryTest.php
@@ -1282,17 +1282,16 @@ public function testWhere()
 	*/
 	public function test__clone_array()
 	{
+		$baseElement = new JDatabaseQueryInspector($this->getMockDatabase());
 
-
-
-		$baseElement = new JDatabaseQueryInspector($this->dbo);
-
-		$baseElement->testArray = array('a', 'b', 'c');
+		$baseElement->testArray = array();
 
 		$cloneElement = clone($baseElement);
 
+		$baseElement->testArray[] = 'test';
+
 		$this->assertFalse($baseElement === $cloneElement);
-		$this->assertFalse($baseElement->testArray === $cloneElement->testArray);
+		$this->assertTrue(count($cloneElement->testArray) == 0);
 	}
 
 	/**
@@ -1304,13 +1303,14 @@ public function test__clone_array()
 	 */
 	public function test__clone_object()
 	{
+		$baseElement = new JDatabaseQueryInspector($this->getMockDatabase());
 
-		$baseElement = new JDatabaseQueryInspector($this->dbo);
-
+		$baseElement->testObject = new stdClass;
 
 		$cloneElement = clone($baseElement);
 
 		$this->assertFalse($baseElement === $cloneElement);
+
 		$this->assertFalse($baseElement->testObject === $cloneElement->testObject);
 	}
 }