Fix DataSet test error

windwalker-io · Jul 27, 2015 · 9a08b1c · 9a08b1c
1 parent 70181be
commit 9a08b1c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/Data/DataSet.php b/src/Data/DataSet.php
@@ -65,7 +65,7 @@ public function bind($dataset)
 
 		foreach ($dataset as $data)
 		{
-			$this->data[] = $data;
+			$this[] = $data;
 		}
 
 		return $this;

diff --git a/src/Data/Test/DataSetTest.php b/src/Data/Test/DataSetTest.php
@@ -168,6 +168,7 @@ public function testOffsetExists()
 	 * @return void
 	 *
 	 * @covers Windwalker\Data\DataSet::offsetGet
+	 * @covers Windwalker\Data\DataSet::offsetSet
 	 */
 	public function testOffsetGetAndSet()
 	{
@@ -178,6 +179,10 @@ public function testOffsetGetAndSet()
 		$this->instance[3] = new Data(array('foo' => 'bar'));
 
 		$this->assertEquals('bar', $this->instance[3]->foo);
+
+		$this->instance[4] = new \stdClass;
+
+		$this->assertInstanceOf('Windwalker\Data\Data', $this->instance[4]);
 	}
 
 	/**

diff --git a/src/DataMapper/Test/DataMapperTest.php b/src/DataMapper/Test/DataMapperTest.php
@@ -446,7 +446,7 @@ public function testGetAndSetDataClass()
 		$this->assertEquals('stdClass', $this->instance->getDataClass());
 
 		// If we use DataSet, all stdClass will be auto convert to Data
-		$this->assertInstanceOf('Windwalker\\Data\\Data', $this->instance->findOne());
+		$this->assertInstanceOf('Windwalker\Data\Data', $this->instance->findOne());
 
 		$this->instance->setDatasetClass('ArrayObject');