BUG: Encapsulation

Julien Jomier · Julien Jomier · commit 6423d042c9e2 · 2011-03-23T10:17:55.000+01:00
diff --git a/tests/core/DatabaseTestCase.php b/tests/core/DatabaseTestCase.php
@@ -86,12 +86,12 @@ protected function loadData($modelName,$file=null)
         }
 
       $data=$this->getDataSet($file);
-      $dataUsers=$data->getTable($model->_name);
+      $dataUsers=$data->getTable($model->getName());
       $rows=$dataUsers->getRowCount();
       $key=array();
       for($i=0; $i<$dataUsers->getRowCount();$i++)
         {
-        $key[]=$dataUsers->getValue($i, $model->_key);
+        $key[]=$dataUsers->getValue($i, $model->getKey());
         }
       return $model->load($key);
       }

Original file line number	Diff line number	Diff line change
`@@ -86,12 +86,12 @@ protected function loadData($modelName,$file=null)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`$data=$this->getDataSet($file);`
`89`		`- $dataUsers=$data->getTable($model->_name);`
	`89`	`+ $dataUsers=$data->getTable($model->getName());`
`90`	`90`	`$rows=$dataUsers->getRowCount();`
`91`	`91`	`$key=array();`
`92`	`92`	`for($i=0; $i<$dataUsers->getRowCount();$i++)`
`93`	`93`	`{`
`94`		`- $key[]=$dataUsers->getValue($i, $model->_key);`
	`94`	`+ $key[]=$dataUsers->getValue($i, $model->getKey());`
`95`	`95`	`}`
`96`	`96`	`return $model->load($key);`
`97`	`97`	`}`