[fix] unit tests composite datasets

This commit is contained in:
alban 2014-03-27 10:20:26 +01:00
parent dfd0080c2c
commit 492dd25c5a
3 changed files with 22 additions and 15 deletions
phpunit
lib
tests/bureau/class

View File

@ -21,13 +21,21 @@ abstract class AlterncTest extends PHPUnit_Extensions_Database_TestCase
* @return \PHPUnit_Extensions_Database_DataSet_YamlDataSet * @return \PHPUnit_Extensions_Database_DataSet_YamlDataSet
* @throws \Exception * @throws \Exception
*/ */
public function loadDataSet($file_name) public function loadDataSet($fileList)
{ {
if( !is_array($fileList)){
$fileList = array($fileList);
}
$datasetList = array();
foreach ($fileList as $file_name) {
$file = PHPUNIT_DATASETS_PATH."/$file_name"; $file = PHPUNIT_DATASETS_PATH."/$file_name";
if( !is_file($file) ){ if( !is_file($file) ){
throw new \Exception("missing $file"); throw new \Exception("missing $file");
} }
$dataSet = new PHPUnit_Extensions_Database_DataSet_YamlDataSet($file); $dataSet = new PHPUnit_Extensions_Database_DataSet_YamlDataSet($file);
$datasetList[] = $dataSet;
}
$compositeDataSet = new PHPUnit_Extensions_Database_DataSet_CompositeDataSet($datasetList);
return $dataSet; return $dataSet;
} }

View File

@ -320,7 +320,6 @@ class m_mailTest extends AlterncTest
public function testCreate_alias() public function testCreate_alias()
{ {
// Test #1580 // Test #1580
$this->object->
} }
/** /**