Skip to content

Commit

Permalink
Add phpunit test
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Oct 22, 2017
1 parent 83c1928 commit 4247038
Show file tree
Hide file tree
Showing 6 changed files with 326 additions and 14 deletions.
9 changes: 6 additions & 3 deletions htdocs/supplier_proposal/class/supplier_proposal.class.php
Expand Up @@ -1222,9 +1222,7 @@ function fetch($rowid,$ref='')

$this->lines = array();

/*
* Lignes askprice liees a un produit ou non
*/
// Lines of supplier proposals
$sql = "SELECT d.rowid, d.fk_supplier_proposal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
$sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
Expand Down Expand Up @@ -1436,6 +1434,11 @@ function valid($user, $notrigger=0)
return -1;
}
}
else
{
dol_syslog("You don't have permission to validate supplier proposal", LOG_WARNING);
return -1;
}
}

/**
Expand Down
17 changes: 11 additions & 6 deletions htdocs/user/class/user.class.php
Expand Up @@ -425,12 +425,13 @@ function fetch($id='', $login='', $sid='', $loadpersonalconf=0, $entity=-1)
/**
* Add a right to the user
*
* @param int $rid id du droit a ajouter
* @param string $allmodule Ajouter tous les droits du module allmodule
* @param string $allperms Ajouter tous les droits du module allmodule, perms allperms
* @param int $rid id of permission to add
* @param string $allmodule Add all permissions of module $allmodule
* @param string $allperms Add all permissions of module $allmodule, subperms $allperms only
* @param int $entity Entity to use
* @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
* @return int > 0 if OK, < 0 if KO
* @see clearrights, delrights, getrights
*/
function addrights($rid, $allmodule='', $allperms='', $entity=0, $notrigger=0)
{
Expand Down Expand Up @@ -475,8 +476,11 @@ function addrights($rid, $allmodule='', $allperms='', $entity=0, $notrigger=0)
// On a pas demande un droit en particulier mais une liste de droits
// sur la base d'un nom de module de de perms
// Where pour la liste des droits a ajouter
if (! empty($allmodule)) $whereforadd="module='".$this->db->escape($allmodule)."'";
if (! empty($allperms)) $whereforadd=" AND perms='".$this->db->escape($allperms)."'";
if (! empty($allmodule))
{
$whereforadd="module='".$this->db->escape($allmodule)."'";
if (! empty($allperms)) $whereforadd.=" AND perms='".$this->db->escape($allperms)."'";
}
}

// Ajout des droits trouves grace au critere whereforadd
Expand Down Expand Up @@ -544,6 +548,7 @@ function addrights($rid, $allmodule='', $allperms='', $entity=0, $notrigger=0)
* @param int $entity Entity to use
* @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
* @return int > 0 if OK, < 0 if OK
* @see clearrights, addrights, getrights
*/
function delrights($rid, $allmodule='', $allperms='', $entity=0, $notrigger=0)
{
Expand Down Expand Up @@ -665,7 +670,7 @@ function clearrights()
*
* @param string $moduletag Limit permission for a particular module ('' by default means load all permissions)
* @return void
* @see clearrights
* @see clearrights, delrights, addrights
*/
function getrights($moduletag='')
{
Expand Down
12 changes: 8 additions & 4 deletions test/phpunit/AllTests.php
Expand Up @@ -113,6 +113,11 @@ public static function suite()
require_once dirname(__FILE__).'/SecurityTest.php';
$suite->addTestSuite('SecurityTest');

require_once dirname(__FILE__).'/UserTest.php';
$suite->addTestSuite('UserTest');
require_once dirname(__FILE__).'/UserGroupTest.php';
$suite->addTestSuite('UserGroupTest');

require_once dirname(__FILE__).'/NumberingModulesTest.php';
$suite->addTestSuite('NumberingModulesTest');
require_once dirname(__FILE__).'/PgsqlTest.php';
Expand Down Expand Up @@ -151,6 +156,9 @@ public static function suite()
require_once dirname(__FILE__).'/PropalTest.php';
$suite->addTestSuite('PropalTest');

require_once dirname(__FILE__).'/SupplierProposalTest.php';
$suite->addTestSuite('SupplierProposalTest');

require_once dirname(__FILE__).'/CommandeTest.php';
$suite->addTestSuite('CommandeTest');

Expand All @@ -166,10 +174,6 @@ public static function suite()
require_once dirname(__FILE__).'/FactureFournisseurTest.php';
$suite->addTestSuite('FactureFournisseurTest');

require_once dirname(__FILE__).'/UserTest.php';
$suite->addTestSuite('UserTest');
require_once dirname(__FILE__).'/UserGroupTest.php';
$suite->addTestSuite('UserGroupTest');
require_once dirname(__FILE__).'/BankAccountTest.php';
$suite->addTestSuite('BankAccountTest');
require_once dirname(__FILE__).'/CompanyBankAccountTest.php';
Expand Down
1 change: 1 addition & 0 deletions test/phpunit/PropalTest.php
Expand Up @@ -180,6 +180,7 @@ public function testPropalAddLine($localobject)
$langs=$this->savlangs;
$db=$this->savdb;

$localobject->fetch_thirdparty();
$result=$localobject->addline('Added line', 10, 2, 19.6);

$this->assertLessThan($result, 0);
Expand Down
273 changes: 273 additions & 0 deletions test/phpunit/SupplierProposalTest.php
@@ -0,0 +1,273 @@
<?php
/* Copyright (C) 2017 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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 3 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 <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/

/**
* \file test/phpunit/SupplierProposalTest.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/supplier_proposal/class/supplier_proposal.class.php';

if (empty($user->id))
{
print "Load permissions for admin user nb 1\n";
$user->fetch(1);

//$user->addrights(0, 'supplier_proposal');

$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 SupplierProposalTest extends PHPUnit_Framework_TestCase
{
protected $savconf;
protected $savuser;
protected $savlangs;
protected $savdb;

/**
* Constructor
* We save global variables into local variables
*
* @return PropalTest
*/
function __construct()
{
//$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";
}

// tear down after class
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";
//print $db->getVersion()."\n";
}
/**
* End phpunit tests
*
* @return void
*/
protected function tearDown()
{
print __METHOD__."\n";
}

/**
* testSupplierProposalCreate
*
* @return void
*/
public function testSupplierProposalCreate()
{
global $conf,$user,$langs,$db;
$conf=$this->savconf;
$user=$this->savuser;
$langs=$this->savlangs;
$db=$this->savdb;

$localobject=new SupplierProposal($this->savdb);
$localobject->initAsSpecimen();
$result=$localobject->create($user);

$this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n";
return $result;
}

/**
* testSupplierProposalFetch
*
* @param int $id Id of object
* @return void
*
* @depends testSupplierProposalCreate
* The depends says test is run only if previous is ok
*/
public function testSupplierProposalFetch($id)
{
global $conf,$user,$langs,$db;
$conf=$this->savconf;
$user=$this->savuser;
$langs=$this->savlangs;
$db=$this->savdb;

$localobject=new SupplierProposal($this->savdb);
$result=$localobject->fetch($id);

$this->assertLessThan($result, 0);
print __METHOD__." id=".$id." result=".$result."\n";
return $localobject;
}

/**
* testSupplierProposalAddLine
*
* @param int $localobject Proposal
* @return void
*
* @depends testSupplierProposalFetch
* The depends says test is run only if previous is ok
*/
public function testSupplierProposalAddLine($localobject)
{
global $conf,$user,$langs,$db;
$conf=$this->savconf;
$user=$this->savuser;
$langs=$this->savlangs;
$db=$this->savdb;

$localobject->fetch_thirdparty();
$result=$localobject->addline('Added line', 10, 2, 19.6);

$this->assertLessThan($result, 0);
print __METHOD__." id=".$localobject->id." result=".$result."\n";
return $localobject;
}

/**
* testSupplierProposalValid
*
* @param Proposal $localobject Proposal
* @return Proposal
*
* @depends testSupplierProposalAddLine
* The depends says test is run only if previous is ok
*/
public function testSupplierProposalValid($localobject)
{
global $conf,$user,$langs,$db;
$conf=$this->savconf;
$user=$this->savuser;
$langs=$this->savlangs;
$db=$this->savdb;

$result=$localobject->valid($user);

print __METHOD__." id=".$localobject->id." result=".$result."\n";
$this->assertLessThan($result, 0);
return $localobject;
}

/**
* testSupplierProposalOther
*
* @param Proposal $localobject Proposal
* @return int
*
* @depends testSupplierProposalValid
* The depends says test is run only if previous is ok
*/
public function testSupplierProposalOther($localobject)
{
global $conf,$user,$langs,$db;
$conf=$this->savconf;
$user=$this->savuser;
$langs=$this->savlangs;
$db=$this->savdb;

/*$result=$localobject->setstatus(0);
print __METHOD__." id=".$localobject->id." result=".$result."\n";
$this->assertLessThan($result, 0);
*/

$localobject->info($localobject->id);
print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
$this->assertNotEquals($localobject->date_creation, '');

return $localobject->id;
}

/**
* testSupplierProposalDelete
*
* @param int $id Id of proposal
* @return void
*
* @depends testSupplierProposalOther
* The depends says test is run only if previous is ok
*/
public function testSupplierProposalDelete($id)
{
global $conf,$user,$langs,$db;
$conf=$this->savconf;
$user=$this->savuser;
$langs=$this->savlangs;
$db=$this->savdb;

$localobject=new SupplierProposal($this->savdb);
$result=$localobject->fetch($id);
$result=$localobject->delete($user);

print __METHOD__." id=".$id." result=".$result."\n";
$this->assertLessThan($result, 0);
return $result;
}

}

0 comments on commit 4247038

Please sign in to comment.