kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
phpunit/lib/AlterncTest.php
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)
{ {
$file = PHPUNIT_DATASETS_PATH."/$file_name"; if( !is_array($fileList)){
if( !is_file($file) ){ $fileList = array($fileList);
throw new \Exception("missing $file");
} }
$dataSet = new PHPUnit_Extensions_Database_DataSet_YamlDataSet($file); $datasetList = array();
foreach ($fileList as $file_name) {
$file = PHPUNIT_DATASETS_PATH."/$file_name";
if( !is_file($file) ){
throw new \Exception("missing $file");
}
$dataSet = new PHPUnit_Extensions_Database_DataSet_YamlDataSet($file);
$datasetList[] = $dataSet;
}
$compositeDataSet = new PHPUnit_Extensions_Database_DataSet_CompositeDataSet($datasetList);
return $dataSet; return $dataSet;
} }

18
phpunit/tests/_datasets/domaines.yml
View File

@ -1,11 +1,11 @@
domaines: domaines:
- -
id : 1 id : 1
compte : 2001 compte : 2001
domaine : example.tld domaine : example.tld
gesdns : 1 gesdns : 1
gesmx : 1 gesmx : 1
noerase : 0 noerase : 0
dns_action : OK dns_action : OK
dns_result : 0 dns_result : 0
zonettl : 86400 zonettl : 86400

1
phpunit/tests/bureau/class/m_mailTest.php
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->
} }
/** /**