From 75bb0eddd7de715d39407111fa430f576056c68e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 19 Feb 2012 20:31:59 +0100 Subject: [PATCH] Fix: Bad br. --- htdocs/core/lib/pdf.lib.php | 8 +- test/phpunit/PdfTest.php | 147 ++++++++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+), 4 deletions(-) create mode 100755 test/phpunit/PdfTest.php diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 2efed69b78c..5c17ff126f4 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -703,10 +703,10 @@ function pdf_writelinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hide } /** - * Return line description translated in outputlangs and encoded in UTF8 + * Return line description translated in outputlangs and encoded into htmlentities * * @param Object $object Object - * @param int $i Current line number + * @param int $i Current line number (0 = first line, 1 = second line, ...) * @param Translate $outputlangs Object langs for output * @param int $hideref Hide reference * @param int $hidedesc Hide description @@ -720,7 +720,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl $idprod=$object->lines[$i]->fk_product; $label=$object->lines[$i]->label; if (empty($label)) $label=$object->lines[$i]->libelle; $desc=$object->lines[$i]->desc; if (empty($desc)) $desc=$object->lines[$i]->description; - $ref_supplier=$object->lines[$i]->ref_supplier; if (empty($ref_supplier)) $ref_supplier=$object->lines[$i]->ref_fourn; // TODO Not yeld saved for supplier invoices, only supplier orders + $ref_supplier=$object->lines[$i]->ref_supplier; if (empty($ref_supplier)) $ref_supplier=$object->lines[$i]->ref_fourn; // TODO Not yet saved for supplier invoices, only supplier orders $note=$object->lines[$i]->note; if ($issupplierline) $prodser = new ProductFournisseur($db); @@ -744,7 +744,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl // Description long of product line if ($desc && ($desc != $label)) { - if ( $libelleproduitservice && empty($hidedesc) ) $libelleproduitservice.="
"; + if ( $libelleproduitservice && empty($hidedesc) ) $libelleproduitservice.="\n"; if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except) { diff --git a/test/phpunit/PdfTest.php b/test/phpunit/PdfTest.php new file mode 100755 index 00000000000..ee63931443e --- /dev/null +++ b/test/phpunit/PdfTest.php @@ -0,0 +1,147 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ + +/** + * \file test/phpunit/CategorieTest.php + * \ingroup test + * \brief PHPUnit test + * \remarks To run this script as CLI: phpunit filename.php + */ + +global $conf,$user,$langs,$db; +//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver +require_once 'PHPUnit/Autoload.php'; +require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; +require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php'; +require_once dirname(__FILE__).'/../../htdocs/product/class/product.class.php'; +require_once dirname(__FILE__).'/../../htdocs/core/lib/pdf.lib.php'; + +if (empty($user->id)) +{ + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); +} +$conf->global->MAIN_DISABLE_ALL_MAILS=1; + + +/** + * Class for PHPUnit tests + * + * @backupGlobals disabled + * @backupStaticAttributes enabled + * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. + */ +class PdfTest extends PHPUnit_Framework_TestCase +{ + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; + + /** + * Constructor + * We save global variables into local variables + * + * @return PdfTest + */ + function PdfTest() + { + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; + + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; + } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + public static function tearDownAfterClass() + { + global $conf,$user,$langs,$db; + $db->rollback(); + + print __METHOD__."\n"; + } + + /** + * Init phpunit tests + * + * @return void + */ + protected function setUp() + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + print __METHOD__."\n"; + } + /** + * End phpunit tests + * + * @return void + */ + protected function tearDown() + { + print __METHOD__."\n"; + } + + /** + * testPdfGetLineDesc + * + * @return void + */ + public function testPdfGetLineDesc() + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + $localobject=new Facture($this->savdb); + $localobject->initAsSpecimen(); + $localobject->lines=array(); + $localobject->lines[0]->fk_product=1; + $localobject->lines[0]->label='Label 1'; + $localobject->lines[0]->desc="This is a description with a é accent\n(Country of origin: France)"; + + print __METHOD__." fk_product=".$localobject->lines[0]->fk_product."\n"; + print __METHOD__." label=".($localobject->lines[0]->label?$localobject->lines[0]->label:$localobject->lines[0]->libelle)."\n"; + print __METHOD__." desc=".$localobject->lines[0]->desc."\n"; + $result=pdf_getlinedesc($localobject,0,$langs); + print __METHOD__." result=".$result."\n"; + $this->assertEquals($result,'PIDRESS - Label 1
This is a description with a é accent
(Country of origin: France)'); + } + +} +?> \ No newline at end of file