lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix phpunit regression. phpunit test on ws invoice is cleaner.

Browse Source
This commit is contained in:
Laurent Destailleur 2016-06-21 01:07:44 +02:00
parent 6317cb53f2
commit 73fb7b2615
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/class/facture.class.php
View File

@ -263,7 +263,7 @@ class Facture extends CommonInvoice
$result=$soc->fetch($this->socid); $result=$soc->fetch($this->socid);
if ($result < 0) if ($result < 0)
{ {
$this->error="Failed to fetch company"; $this->error="Failed to fetch company: ".$soc->error;
dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
return -2; return -2;
} }

26
test/phpunit/WebservicesInvoicesTest.php
View File

@ -84,11 +84,11 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
$this->soapclient->decodeUTF8(false); $this->soapclient->decodeUTF8(false);
} }
// create a third_party, needed to create an invoice // create third_parties, needed to test an invoice
$societe=new Societe($db); $societe=new Societe($db);
$societe->ref=''; $societe->ref='';
$societe->name='name'; $societe->name='name';
$societe->ref_ext='209'; $societe->ref_ext='ref-phpunit';
$societe->status=1; $societe->status=1;
$societe->client=1; $societe->client=1;
$societe->fournisseur=0; $societe->fournisseur=0;
@ -167,16 +167,16 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
$WS_METHOD = 'createInvoice'; $WS_METHOD = 'createInvoice';
// load societe first // load societe first
$societe=new Societe($db); /*$societe=new Societe($db);
$societe->fetch('', '', '209'); $societe->fetch('', '', 'ref-phpunit');
print __METHOD__." societe loaded id=".$societe->id."\n"; print __METHOD__." societe loaded id=".$societe->id."\n";
*/
$body = array ( $body = array (
"id" => NULL, "id" => NULL,
"ref" => NULL, "ref" => NULL,
"ref_ext" => "165", "ref_ext" => "ref-phpunit-2",
"thirdparty_id" => $societe->id, "thirdparty_id" => $this->socid,
"fk_user_author" => NULL, "fk_user_author" => NULL,
"fk_user_valid" => NULL, "fk_user_valid" => NULL,
"date" => "2015-04-19 20:16:53", "date" => "2015-04-19 20:16:53",
@ -247,7 +247,7 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
print __METHOD__." result=".$result['result']['result_code']."\n"; print __METHOD__." result=".$result['result']['result_code']."\n";
$this->assertEquals('OK',$result['result']['result_code']); $this->assertEquals('OK',$result['result']['result_code']);
$this->assertEquals('165', $result['ref_ext']); $this->assertEquals('ref-phpunit-2', $result['ref_ext']);
return $result; return $result;
@ -282,7 +282,7 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
// Test URL // Test URL
$result=''; $result='';
$parameters = array('authentication'=>$authentication,'id'=>NULL,'ref'=>NULL,'ref_ext'=>165); $parameters = array('authentication'=>$authentication,'id'=>NULL,'ref'=>NULL,'ref_ext'=>'ref-phpunit-2');
print __METHOD__." call method ".$WS_METHOD."\n"; print __METHOD__." call method ".$WS_METHOD."\n";
try { try {
$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,''); $result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
@ -303,7 +303,7 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
} }
print __METHOD__." result=".$result['result']['result_code']."\n"; print __METHOD__." result=".$result['result']['result_code']."\n";
$this->assertEquals('OK',$result['result']['result_code']); $this->assertEquals('OK',$result['result']['result_code']);
$this->assertEquals('165', $result['invoice']['ref_ext']); $this->assertEquals('ref-phpunit-2', $result['invoice']['ref_ext']);
return $result; return $result;
@ -332,8 +332,8 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
$body = array ( $body = array (
"id" => NULL, "id" => NULL,
"ref" => NULL, "ref" => NULL,
"ref_ext" => "165", "ref_ext" => "ref-phpunit-2",
"thirdparty_id" => "209", "thirdparty_id" => $this->socid,
"fk_user_author" => NULL, "fk_user_author" => NULL,
"fk_user_valid" => NULL, "fk_user_valid" => NULL,
"date" => "2015-04-19 20:16:53", "date" => "2015-04-19 20:16:53",
@ -404,7 +404,7 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
print __METHOD__." result=".$result['result']['result_code'].$result['result']['result_label']."\n"; print __METHOD__." result=".$result['result']['result_code'].$result['result']['result_label']."\n";
$this->assertEquals('OK',$result['result']['result_code']); $this->assertEquals('OK',$result['result']['result_code']);
$this->assertEquals('165', $result['ref_ext']); $this->assertEquals('ref-phpunit-2', $result['ref_ext']);
return $result; return $result;