diff --git a/unit-test/create-dossier-test.sh b/unit-test/create-dossier-test.sh index 4a61cba3c..3360797a9 100755 --- a/unit-test/create-dossier-test.sh +++ b/unit-test/create-dossier-test.sh @@ -2,7 +2,7 @@ export PGCLUSTER=10/main DOSSIER_TEST=rel70dossier25 -FILE_TEST=dossiertest210620-1111.sql +FILE_TEST=dossier25.sql dropdb $DOSSIER_TEST if [ $? -ne 0 ] ; then diff --git a/unit-test/facility.class.php b/unit-test/facility.class.php index 3f1d0794e..1dc8b79fd 100644 --- a/unit-test/facility.class.php +++ b/unit-test/facility.class.php @@ -33,19 +33,23 @@ class Facility */ static function page_start() { - $noalyss_home=NOALYSS_HOME; + + $noalyss_url=NOALYSS_URL; $ret=<< - PRINTJRN NOALYSS + PHPUNIT NOALYSS - - - - - - + + + + + + + + +
diff --git a/unit-test/include/class/acc_account_ledger.Test.php b/unit-test/include/class/acc_account_ledger.Test.php index 1e6debdd4..fd8819650 100644 --- a/unit-test/include/class/acc_account_ledger.Test.php +++ b/unit-test/include/class/acc_account_ledger.Test.php @@ -305,7 +305,7 @@ class Acc_Account_LedgerTest extends TestCase { global $g_connection; $accounting=new Acc_Account_Ledger($g_connection, '4511'); - $this->assertEquals(1397.87,$accounting->get_solde(),"get_solde"); + $this->assertEquals(319.05,$accounting->get_solde(),"get_solde"); } /** @@ -317,8 +317,8 @@ class Acc_Account_LedgerTest extends TestCase $accounting=new Acc_Account_Ledger($g_connection, '4511'); $expected=array ( 'debit' => '0', - 'credit' => '1397.8700', - 'solde' => 1397.87, + 'credit' => '319.0500', + 'solde' => 319.05, ); $this->assertEquals($accounting->get_solde_detail(),$expected); } diff --git a/unit-test/include/class/acc_balance.Test.php b/unit-test/include/class/acc_balance.Test.php index cdc38521b..ab9b7f58f 100644 --- a/unit-test/include/class/acc_balance.Test.php +++ b/unit-test/include/class/acc_balance.Test.php @@ -64,9 +64,9 @@ class Acc_BalanceTest extends TestCase $this->object->filter_cat(array()); $this->assertEquals($this->object->jrn,null); $this->object->filter_cat(array('2'=>'FIN')); - $this->assertEquals([1,83],$this->object->jrn); + $this->assertEquals([1,83,152],$this->object->jrn); $this->object->filter_cat(array('1'=>'ACH','2'=>'FIN')); - $this->assertEquals($this->object->jrn,[3,35,1,83]); + $this->assertEquals([35,3,1,83,152],$this->object->jrn); } /** *@covers Acc_Balance::summary_add diff --git a/unit-test/include/class/acc_bilan.Test.php b/unit-test/include/class/acc_bilan.Test.php index be4b7fe85..90637dd01 100644 --- a/unit-test/include/class/acc_bilan.Test.php +++ b/unit-test/include/class/acc_bilan.Test.php @@ -142,7 +142,7 @@ class Acc_BilanTest extends TestCase $this->assertTrue(isset($this->object->C61),"Exist C61"); $this->assertEquals($this->object->C70,456.8); $this->assertEquals($this->object->C60,0); - $this->assertEquals($this->object->C61,1491.50); + $this->assertEquals($this->object->C61,1468.33); } diff --git a/unit-test/include/class/acc_ledger.Test.php b/unit-test/include/class/acc_ledger.Test.php index bf28be49b..7959dd1d2 100644 --- a/unit-test/include/class/acc_ledger.Test.php +++ b/unit-test/include/class/acc_ledger.Test.php @@ -293,8 +293,8 @@ class Acc_LedgerTest extends TestCase $max=$g_connection->get_value("select max(p_id) from parm_periode"); $min=$g_connection->get_value("select min(p_id) from parm_periode"); $solde=$ledger->get_solde($min,$max); - $this->assertEquals($solde[1],10936.91); - $this->assertEquals($solde[0],10936.91); + $this->assertEquals($solde[1],4938.64); + $this->assertEquals($solde[0],4938.6400); } @@ -304,7 +304,7 @@ class Acc_LedgerTest extends TestCase public function testSelect_ledger() { $select_available=$this->object->select_ledger(); - $this->assertEquals(7,count($select_available->value)); + $this->assertEquals(8,count($select_available->value)); } /** * @covers Acc_Ledger::get_fiche_def @@ -814,18 +814,16 @@ class Acc_LedgerTest extends TestCase public function testInput_new() { put_global([["key"=>"ac","value"=>"ODS"]]); -// ob_start(); -// -// $this->object->set_ledger_id(4); -// $this->object->input_new(); -// $result=ob_get_contents(); -// $file=fopen(__DIR__."/file/acc_ledger_input_new.txt","w+"); -// fwrite($file,$result); -// fclose($file);*/ - $this->expectOutputRegex('! Banque<\/TD><\/TR> Client<\/TD><\/TR> Fournisseur<\/TD><\/TR> Marchandises<\/TD><\/TR> Services & Biens Divers<\/TD><\/TR> Stock<\/TD><\/TR> Vente<\/TD><\/TR> <\/TABLE>! -'); + + echo \Noalyss\Facility::page_start(); $this->object->set_ledger_id(4); $this->object->input_new(); + $result=ob_get_contents(); + \Noalyss\Facility::save_file(__DIR__."/file", "acc_ledgder-input_new.html", $result); + $size=filesize(__DIR__."/file/acc_ledgder-input_new.html"); + echo "size is [$size]"; + + $this->assertEquals(15063,$size," output input_new is not what it is expected"); } /** diff --git a/unit-test/include/class/acc_ledger_historyTest.php b/unit-test/include/class/acc_ledger_historyTest.php index 94cb00127..4d532ca4d 100644 --- a/unit-test/include/class/acc_ledger_historyTest.php +++ b/unit-test/include/class/acc_ledger_historyTest.php @@ -118,17 +118,17 @@ class Acc_Ledger_HistoryTest extends TestCase $object=Acc_Ledger_History::factory($g_connection, [2],$p_min_id ,$p_max_id , "D", 'all'); $object->get_row(); $a_row=$object->get_data(); - $this->assertEquals(15,count($a_row)); + $this->assertEquals(13,count($a_row)); $object->set_filter_operation("paid"); $object->get_row(); $a_row=$object->get_data(); - $this->assertEquals(3,count($a_row)); + $this->assertEquals(6,count($a_row)); $object->set_filter_operation("unpaid"); $object->get_row(); $a_row=$object->get_data(); - $this->assertEquals(12,count($a_row)); + $this->assertEquals(7,count($a_row)); } diff --git a/unit-test/include/class/acc_ledger_history_purchase.Test.php b/unit-test/include/class/acc_ledger_history_purchase.Test.php index 4934de401..4be8ab9af 100644 --- a/unit-test/include/class/acc_ledger_history_purchase.Test.php +++ b/unit-test/include/class/acc_ledger_history_purchase.Test.php @@ -62,7 +62,7 @@ class Acc_Ledger_History_PurchaseTest extends TestCase function testGet_Row() { $this->object->get_row(); - $this->assertSame(19,count($this->object->get_data()),"Acc_Ledger_History_Purchase->get_data"); + $this->assertEquals(16,count($this->object->get_data()),"Acc_Ledger_History_Purchase->get_data"); } //@covers Acc_Ledger_History_Financial::export_oneline_html diff --git a/unit-test/include/class/acc_ledger_history_sale.Test.php b/unit-test/include/class/acc_ledger_history_sale.Test.php index 3b622239f..8b130e9b5 100644 --- a/unit-test/include/class/acc_ledger_history_sale.Test.php +++ b/unit-test/include/class/acc_ledger_history_sale.Test.php @@ -55,7 +55,7 @@ class Acc_Ledger_History_SaleTest extends TestCase function testGet_row() { $this->object->get_row(); - $this->assertSame(10,count($this->object->get_data()),"Acc_Ledger_History_Sale->get_row"); + $this->assertEquals(6,count($this->object->get_data()),"Acc_Ledger_History_Sale->get_row"); } private function save_file($p_name,$content) { diff --git a/unit-test/include/class/acc_ledger_search.Test.php b/unit-test/include/class/acc_ledger_search.Test.php index 0e7fb6586..a1fbe72eb 100644 --- a/unit-test/include/class/acc_ledger_search.Test.php +++ b/unit-test/include/class/acc_ledger_search.Test.php @@ -67,7 +67,7 @@ class Acc_Ledger_Test extends TestCase $result=$ledger->build_search_sql(NULL); $a_result=$g_connection->get_array($result[0]); $this->assertEquals(4,count($a_result)); - $this->assertEquals(" jrn_def_id in (3,83,1,35,4,2,36,-1) and jr_date >= to_date('02.01.2019','DD.MM.YYYY')". + $this->assertEquals(" jrn_def_id in (3,83,152,1,35,4,2,36,-1) and jr_date >= to_date('02.01.2019','DD.MM.YYYY')". " and jr_date <= to_date('31.01.2019','DD.MM.YYYY')",$result[1]); // Expect exception diff --git a/unit-test/include/class/data/tax_summary_getrow_purchase_o.php b/unit-test/include/class/data/tax_summary_getrow_purchase_o.php index 9d8f6e8d4..30069a468 100644 --- a/unit-test/include/class/data/tax_summary_getrow_purchase_o.php +++ b/unit-test/include/class/data/tax_summary_getrow_purchase_o.php @@ -53,8 +53,8 @@ array ( 'tva_rate' => '0.0600', 'tva_both_side' => '0', 'qp_vat_code' => '3', - 'amount_vat' => '7.7200', - 'amount_wovat' => '129.2200', + 'amount_vat' => '5.2800', + 'amount_wovat' => '88.3200', 'amount_sided' => '0.0000', 'amount_noded_amount' => '0.0000', 'amount_noded_tax' => '0.0000', @@ -84,7 +84,7 @@ array ( 'tva_both_side' => '0', 'qp_vat_code' => '6', 'amount_vat' => '0.0000', - 'amount_wovat' => '307.5900', + 'amount_wovat' => '286.9500', 'amount_sided' => '0.0000', 'amount_noded_amount' => '0.0000', 'amount_noded_tax' => '0.0000', diff --git a/unit-test/include/class/data/tax_summary_getrow_purchase_t.php b/unit-test/include/class/data/tax_summary_getrow_purchase_t.php index 55308e3ed..fbe68f3f8 100644 --- a/unit-test/include/class/data/tax_summary_getrow_purchase_t.php +++ b/unit-test/include/class/data/tax_summary_getrow_purchase_t.php @@ -53,8 +53,8 @@ array ( 'tva_rate' => '0.0600', 'tva_both_side' => '0', 'qp_vat_code' => '3', - 'amount_vat' => '7.7200', - 'amount_wovat' => '129.2200', + 'amount_vat' => '5.2800', + 'amount_wovat' => '88.3200', 'amount_sided' => '0.0000', 'amount_noded_amount' => '0.0000', 'amount_noded_tax' => '0.0000', @@ -84,7 +84,7 @@ array ( 'tva_both_side' => '0', 'qp_vat_code' => '6', 'amount_vat' => '0.0000', - 'amount_wovat' => '307.5900', + 'amount_wovat' => '286.9500', 'amount_sided' => '0.0000', 'amount_noded_amount' => '0.0000', 'amount_noded_tax' => '0.0000', diff --git a/unit-test/include/class/data/tax_summary_getrow_sale_o.php b/unit-test/include/class/data/tax_summary_getrow_sale_o.php index f632adaac..6f7009e41 100644 --- a/unit-test/include/class/data/tax_summary_getrow_sale_o.php +++ b/unit-test/include/class/data/tax_summary_getrow_sale_o.php @@ -8,8 +8,8 @@ array ( 'qs_vat_code' => '1', 'tva_rate' => '0.2100', 'tva_both_side' => '0', - 'amount_vat' => '1343.9600', - 'amount_wovat' => '6399.8500', + 'amount_vat' => '219.5700', + 'amount_wovat' => '1045.6000', 'amount_sided' => '0.0000', 'tva_type' => 'O', ), @@ -21,7 +21,7 @@ array ( 'tva_rate' => '0.0000', 'tva_both_side' => '0', 'amount_vat' => '0.0000', - 'amount_wovat' => '1102.9500', + 'amount_wovat' => '1047.9000', 'amount_sided' => '0.0000', 'tva_type' => 'O', ), diff --git a/unit-test/include/class/data/tax_summary_getrow_sale_t.php b/unit-test/include/class/data/tax_summary_getrow_sale_t.php index fdea12496..0289481f7 100644 --- a/unit-test/include/class/data/tax_summary_getrow_sale_t.php +++ b/unit-test/include/class/data/tax_summary_getrow_sale_t.php @@ -8,8 +8,8 @@ array ( 'qs_vat_code' => '1', 'tva_rate' => '0.2100', 'tva_both_side' => '0', - 'amount_vat' => '1343.9600', - 'amount_wovat' => '6399.8500', + 'amount_vat' => '219.5700', + 'amount_wovat' => '1045.6000', 'amount_sided' => '0.0000', 'tva_type' => 'O', ), @@ -21,7 +21,7 @@ array ( 'tva_rate' => '0.0000', 'tva_both_side' => '0', 'amount_vat' => '0.0000', - 'amount_wovat' => '1102.9500', + 'amount_wovat' => '1047.9000', 'amount_sided' => '0.0000', 'tva_type' => 'O', ), diff --git a/unit-test/include/class/data/tax_summary_getsummary_purchase_o.php b/unit-test/include/class/data/tax_summary_getsummary_purchase_o.php index 0c54bea8a..b24b0455b 100644 --- a/unit-test/include/class/data/tax_summary_getsummary_purchase_o.php +++ b/unit-test/include/class/data/tax_summary_getsummary_purchase_o.php @@ -49,7 +49,7 @@ array ( 'tva_rate' => '0.0600', 'tva_both_side' => '0', 'qp_vat_code' => '3', - 'amount_vat' => '7.7200', + 'amount_vat' => '5.2800', 'amount_wovat' => '129.2200', 'amount_sided' => '0.0000', 'amount_noded_amount' => '0.0000', diff --git a/unit-test/include/class/data/tax_summary_getsummary_purchase_t.php b/unit-test/include/class/data/tax_summary_getsummary_purchase_t.php index ea4b551d9..6ca5fd0b3 100644 --- a/unit-test/include/class/data/tax_summary_getsummary_purchase_t.php +++ b/unit-test/include/class/data/tax_summary_getsummary_purchase_t.php @@ -49,8 +49,8 @@ array ( 'tva_rate' => '0.0600', 'tva_both_side' => '0', 'qp_vat_code' => '3', - 'amount_vat' => '7.7200', - 'amount_wovat' => '129.2200', + 'amount_vat' => '5.2800', + 'amount_wovat' => '88.3200', 'amount_sided' => '0.0000', 'amount_noded_amount' => '0.0000', 'amount_noded_tax' => '0.0000', @@ -78,7 +78,7 @@ array ( 'tva_both_side' => '0', 'qp_vat_code' => '6', 'amount_vat' => '0.0000', - 'amount_wovat' => '567.3900', + 'amount_wovat' => '546.7500', 'amount_sided' => '0.0000', 'amount_noded_amount' => '0.0000', 'amount_noded_tax' => '0.0000', diff --git a/unit-test/include/class/data/tax_summary_getsummary_sale_o.php b/unit-test/include/class/data/tax_summary_getsummary_sale_o.php index f72995c46..30daa5229 100644 --- a/unit-test/include/class/data/tax_summary_getsummary_sale_o.php +++ b/unit-test/include/class/data/tax_summary_getsummary_sale_o.php @@ -7,8 +7,8 @@ array ( 'qs_vat_code' => '1', 'tva_rate' => '0.2100', 'tva_both_side' => '0', - 'amount_vat' => '1343.9600', - 'amount_wovat' => '6399.8500', + 'amount_vat' => '219.5700', + 'amount_wovat' => '1045.6000', 'amount_sided' => '0.0000', 'tva_payment_sale' => 'O', ), @@ -19,7 +19,7 @@ array ( 'tva_rate' => '0.0000', 'tva_both_side' => '0', 'amount_vat' => '0.0000', - 'amount_wovat' => '1253.5100', + 'amount_wovat' => '1198.4600', 'amount_sided' => '0.0000', 'tva_payment_sale' => 'O', ), diff --git a/unit-test/include/class/data/tax_summary_getsummary_sale_t.php b/unit-test/include/class/data/tax_summary_getsummary_sale_t.php index e230b45d2..a6b9d6f1c 100644 --- a/unit-test/include/class/data/tax_summary_getsummary_sale_t.php +++ b/unit-test/include/class/data/tax_summary_getsummary_sale_t.php @@ -7,8 +7,8 @@ array ( 'qs_vat_code' => '1', 'tva_rate' => '0.2100', 'tva_both_side' => '0', - 'amount_vat' => '1343.9600', - 'amount_wovat' => '6399.8500', + 'amount_vat' => '219.5700', + 'amount_wovat' => '1045.6000', 'amount_sided' => '0.0000', 'tva_payment_sale' => 'O', ), @@ -19,7 +19,7 @@ array ( 'tva_rate' => '0.0000', 'tva_both_side' => '0', 'amount_vat' => '0.0000', - 'amount_wovat' => '1253.5100', + 'amount_wovat' => '1198.4600', 'amount_sided' => '0.0000', 'tva_payment_sale' => 'O', ), diff --git a/unit-test/include/class/print_LedgerTest.php b/unit-test/include/class/print_LedgerTest.php index e6e676296..c8447a58d 100644 --- a/unit-test/include/class/print_LedgerTest.php +++ b/unit-test/include/class/print_LedgerTest.php @@ -141,7 +141,7 @@ class print_LedgerTest extends TestCase function test_availableLedger() { $a_jrn=\Print_Ledger::available_ledger(94); - $this->assertEquals(6,count($a_jrn),"Number of available ledger correct"); + $this->assertEquals(7,count($a_jrn),"Number of available ledger correct"); } } diff --git a/unit-test/include/class/print_operation_currencyTest.php b/unit-test/include/class/print_operation_currencyTest.php index a7e24f7be..5e651a2f7 100644 --- a/unit-test/include/class/print_operation_currencyTest.php +++ b/unit-test/include/class/print_operation_currencyTest.php @@ -41,7 +41,7 @@ class Print_Operation_CurrencyTest extends TestCase function testFilter_data_currency_card_categoryTest() { $cn=Dossier::connect(); - $from_date='01.01.2020'; + $from_date='01.01.2019'; $to_date='31.12.2020'; $currency_id=0; $card_category=2; @@ -54,12 +54,12 @@ class Print_Operation_CurrencyTest extends TestCase $this->assertContains(" and jrnx.f_id in ( select f_id from fiche where fd_id=$4)",$sql); $array=$object->get_data(); - $this->assertEquals(count($array),2,"operation in EURO"); + $this->assertEquals(count($array),0,"operation in EURO"); $object->setCurrency_id(1); $array=$object->get_data(); - $this->assertEquals(count($array),2,"operations in Dollars"); + $this->assertEquals(count($array),5,"operations in Dollars"); } /** @@ -69,7 +69,7 @@ class Print_Operation_CurrencyTest extends TestCase function testData_currency_operationTest() { $cn=Dossier::connect(); - $from_date='01.01.2020'; + $from_date='01.01.2019'; $to_date='31.12.2020'; $currency_id=0; @@ -82,12 +82,12 @@ class Print_Operation_CurrencyTest extends TestCase $this->assertContains("where jrn.currency_id = $1 and",$sql); $array=$object->get_data(); - $this->assertEquals(count($array),7,"operation in EURO"); + $this->assertEquals(0,count($array),"operation in EURO"); $object->setCurrency_id(1); $array=$object->get_data(); - $this->assertEquals(count($array),8,"operations in Dollars"); + $this->assertEquals(18,count($array),"operations in Dollars"); } /** * @brief test Filter_Data_Currency_Card @@ -109,13 +109,13 @@ class Print_Operation_CurrencyTest extends TestCase $this->assertContains("and f_id=$4",$sql); $array=$object->get_data(); - $this->assertEquals(count($array),1,"operation in EURO"); + $this->assertEquals(0,count($array),"operation in EURO"); $object->setCurrency_id(1); $object->setCard("FOURNI1"); $array=$object->get_data(); - $this->assertEquals(count($array),1,"operations in Dollars"); + $this->assertEquals(2,count($array),"operations in Dollars"); } /** * @brief test Filter_Data_Currency_Card_Accounting @@ -124,7 +124,7 @@ class Print_Operation_CurrencyTest extends TestCase function testFilter_data_currency_accounting() { $cn=Dossier::connect(); - $from_date='01.01.2020'; + $from_date='01.01.2018'; $to_date='31.12.2020'; $currency_id=0; $from_poste='40'; @@ -139,13 +139,13 @@ class Print_Operation_CurrencyTest extends TestCase $sql=$object->SQL_Condition(); $this->assertContains("and j_poste >= $4 and j_poste <= $5",$sql); $array=$object->get_data(); - $this->assertEquals(3,count($array),"operation in EURO"); + $this->assertEquals(0,count($array),"operation in EURO"); $object->setCurrency_id(1); $array=$object->get_data(); - $this->assertEquals(3,count($array),"operations in Dollars"); + $this->assertEquals(7,count($array),"operations in Dollars"); } function testPrint_operation_currency() { @@ -170,7 +170,7 @@ class Print_Operation_CurrencyTest extends TestCase Noalyss\Facility::save_file(__DIR__."/file", "print_operation_currency_by_accounting.csv", $csv); - $this->assertEquals(5,count($array),"by_accounting operation in EURO"); + $this->assertEquals(0,count($array),"by_accounting operation in EURO"); $_REQUEST['p_currency_code']=1; $print_operation=Print_Operation_Currency::build("by_card"); @@ -188,11 +188,11 @@ class Print_Operation_CurrencyTest extends TestCase - $this->assertEquals(4,count($array),"by_card operation in USD"); + $this->assertEquals(2,count($array),"by_card operation in USD"); $print_operation=Print_Operation_Currency::build("all"); $array=$print_operation->getData_operation()->get_data(); - $this->assertEquals(22,count($array),"all operations in Dollars"); + $this->assertEquals(20,count($array),"all operations in Dollars"); ob_start(); $print_operation->export_csv($export); $csv=ob_get_contents(); diff --git a/unit-test/include/class/tax_summary.Test.php b/unit-test/include/class/tax_summary.Test.php index 02d7501bb..43bdd91b3 100644 --- a/unit-test/include/class/tax_summary.Test.php +++ b/unit-test/include/class/tax_summary.Test.php @@ -174,7 +174,7 @@ class Tax_SummaryTest extends TestCase $this->object->set_tva_type("T"); $array=$this->object->get_row_purchase(); //-- For creating the array - Noalyss\Facility::save_file(__DIR__."/file", "tax_summary_getrow_purchase.txt", var_export($array, TRUE)); + //Noalyss\Facility::save_file(__DIR__."/file", "tax_summary_getrow_purchase.txt", var_export($array, TRUE)); require __DIR__."/data/tax_summary_getrow_purchase_t.php"; $this->check_result("tva_type = T , get_row_purchase",$array,$a_result,'ACH');