From 0ca0e0083bf5294e578349dc8323cfd7c42d046a Mon Sep 17 00:00:00 2001 From: Matthieu Marcillaud <marcimat@rezo.net> Date: Sat, 1 Jul 2023 22:01:57 +0200 Subject: [PATCH] =?UTF-8?q?tests:=20Suppressions=20vieux=20tests=20sur=20b?= =?UTF-8?q?alise=20inclure=20car=20d=C3=A9j=C3=A0=20trait=C3=A9s=20en=20PH?= =?UTF-8?q?PUnit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/Squelettes/Balise/InclureTest.php | 4 ++-- .../legacy/unit/balises/inclure_array.html | 20 ------------------- .../legacy/unit/balises/inclure_manquant.html | 9 --------- .../balises/inclure_manquant_fonctions.php | 17 ---------------- .../legacy/unit/balises/inclus_article.html | 1 - .../legacy/unit/balises/inclus_rien.html | 3 --- 6 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 ecrire/tests/legacy/unit/balises/inclure_array.html delete mode 100644 ecrire/tests/legacy/unit/balises/inclure_manquant.html delete mode 100644 ecrire/tests/legacy/unit/balises/inclure_manquant_fonctions.php delete mode 100644 ecrire/tests/legacy/unit/balises/inclus_article.html delete mode 100644 ecrire/tests/legacy/unit/balises/inclus_rien.html diff --git a/ecrire/tests/Squelettes/Balise/InclureTest.php b/ecrire/tests/Squelettes/Balise/InclureTest.php index 095942ccea..22b9655424 100644 --- a/ecrire/tests/Squelettes/Balise/InclureTest.php +++ b/ecrire/tests/Squelettes/Balise/InclureTest.php @@ -20,13 +20,13 @@ class InclureTest extends SquelettesTestCase $this->assertEqualsCode( 'Hello WorldHello World', '<INCLURE{fond=' . $dir . '/data/texte_hello_world}>' - . '<INCLURE{fond=' . $dir . '/data/texte_hello_world}>' + . '<INCLURE{fond=' . $dir . '/data/texte_hello_world}>' ); $this->assertEqualsCode( 'Hello WorldHello World', ' <INCLURE{fond=' . $dir . '/data/texte_hello_world}>' - . '<INCLURE{fond=' . $dir . '/data/texte_hello_world}>' + . '<INCLURE{fond=' . $dir . '/data/texte_hello_world}>' ); } diff --git a/ecrire/tests/legacy/unit/balises/inclure_array.html b/ecrire/tests/legacy/unit/balises/inclure_array.html deleted file mode 100644 index e20117acb7..0000000000 --- a/ecrire/tests/legacy/unit/balises/inclure_array.html +++ /dev/null @@ -1,20 +0,0 @@ -[(#REM) - - la balise INCLURE avec un tableau en argument - -] -#SET{test1,(#INCLURE{fond=#DOSSIER_SQUELETTE/inclus_article}{zero=1})} -#SET{test1,#GET{test1}|concat{(#INCLURE{fond=#DOSSIER_SQUELETTE/inclus_rien})}} -#SET{test1,#GET{test1}|concat{(#INCLURE{fond=#DOSSIER_SQUELETTE/inclus_article}{zero=1})}} -#SET{fonds,#ARRAY{0,#DOSSIER_SQUELETTE/inclus_article,1,#DOSSIER_SQUELETTE/inclus_rien,2,#DOSSIER_SQUELETTE/inclus_article}} -#SET{test2,(#INCLURE{fond=#GET{fonds}}{zero=1})} -[(#GET{test1}|=={#GET{test2}}|?{OK,#GET{test1}!=#GET{test2}})] -<?php ob_start(); -?><INCLURE{fond=#GET{fonds}}{zero=1}><?php -$texte = ob_get_contents(); -ob_end_clean(); -$attendu = '[(#GET{test1}|texte_script)]'; -if ($texte!==$attendu) { - echo "Erreur sur <INCLURE> avec un tableau pour fond : $texte ; attendu : $attendu"; -} -?> \ No newline at end of file diff --git a/ecrire/tests/legacy/unit/balises/inclure_manquant.html b/ecrire/tests/legacy/unit/balises/inclure_manquant.html deleted file mode 100644 index 13694dc3ee..0000000000 --- a/ecrire/tests/legacy/unit/balises/inclure_manquant.html +++ /dev/null @@ -1,9 +0,0 @@ -[(#REM) - - INCLURE un fichier non existant - -] -filtre:fin_inclure_manquant -#SET{toto,'toto9876543210'} -[(#GET{toto}|concat{'.html'}|find_in_path|?{le fichier [(#GET{toto})] ne doit pas exister})] -<INCLURE{fond=#GET{toto}}{env}> diff --git a/ecrire/tests/legacy/unit/balises/inclure_manquant_fonctions.php b/ecrire/tests/legacy/unit/balises/inclure_manquant_fonctions.php deleted file mode 100644 index 07486d202f..0000000000 --- a/ecrire/tests/legacy/unit/balises/inclure_manquant_fonctions.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php - -declare(strict_types=1); - -function fin_inclure_manquant() { - $debusquer = charger_fonction('debusquer', 'public'); - $erreurs = $debusquer('', '', [ - 'erreurs' => 'get', - ]); - - if (!$erreurs && !(_request('var_mode') === 'debug' && erreur_squelette(false))) { - return "pas d'erreur declenchee"; - } - - $GLOBALS['tableau_des_erreurs'] = []; - return 'OK'; -} diff --git a/ecrire/tests/legacy/unit/balises/inclus_article.html b/ecrire/tests/legacy/unit/balises/inclus_article.html deleted file mode 100644 index c7c3e31062..0000000000 --- a/ecrire/tests/legacy/unit/balises/inclus_article.html +++ /dev/null @@ -1 +0,0 @@ -<BOUCLE_art(ARTICLES){#ENV{zero,0},1}>test:#ID_ARTICLE</BOUCLE_art> \ No newline at end of file diff --git a/ecrire/tests/legacy/unit/balises/inclus_rien.html b/ecrire/tests/legacy/unit/balises/inclus_rien.html deleted file mode 100644 index b28b04f643..0000000000 --- a/ecrire/tests/legacy/unit/balises/inclus_rien.html +++ /dev/null @@ -1,3 +0,0 @@ - - - -- GitLab