From 85aa1ae4153709f5848809aec82e4439d318c158 Mon Sep 17 00:00:00 2001 From: "cedric@yterium.com" <cedric@yterium.com@ac52e18a-acf5-0310-9fe8-c4428f23b10a> Date: Sat, 15 Feb 2014 14:07:08 +0000 Subject: [PATCH] rangeons ici tous les tests unitaires dans un sous dossier unit/ pour ne s'y retrouver avec le moteur de test qui contiient maintenant plus de 3 fichiers git-svn-id: https://zone.spip.org/spip-zone/_core_/tests@80727 ac52e18a-acf5-0310-9fe8-c4428f23b10a --- index.php | 5 ++--- {balises => unit/balises}/autoriser.html | 0 {balises => unit/balises}/balise_dyn_langue.html | 0 .../balises}/balise_dyn_langue_fonctions.php | 0 {balises => unit/balises}/balise_dyn_langue_modele.html | 0 .../balises}/balise_dyn_langue_modele_fonctions.php | 0 {balises => unit/balises}/config.html | 0 {balises => unit/balises}/config_fonctions.php | 0 {balises => unit/balises}/doublons.html | 0 {balises => unit/balises}/expose.html | 0 {balises => unit/balises}/filtre.html | 0 {balises => unit/balises}/filtre_fonctions.php | 0 {balises => unit/balises}/formulaire_.html | 0 {balises => unit/balises}/formulaire__fonctions.php | 0 {balises => unit/balises}/inclure_array.html | 0 {balises => unit/balises}/inclure_manquant.html | 0 {balises => unit/balises}/inclure_manquant_fonctions.php | 0 {balises => unit/balises}/inclus_article.html | 0 {balises => unit/balises}/inclus_expose.html | 0 {balises => unit/balises}/inclus_rien.html | 0 {balises => unit/balises}/introduction.html | 0 {balises => unit/balises}/introduction_fonctions.php | 0 {balises => unit/balises}/lesauteurs.html | 0 {balises => unit/balises}/mime_type.html | 0 {balises => unit/balises}/notes.html | 0 {balises => unit/balises}/phraseur_balise_dyn.html | 0 {balises => unit/balises}/session.html | 0 {boucles => unit/boucles}/balise_detachee.html | 0 {boucles => unit/boucles}/boucle_vide.html | 0 {boucles => unit/boucles}/bug764.html | 0 {boucles => unit/boucles}/doublons.html | 0 {boucles => unit/boucles}/hierarchie.html | 0 {config => unit/config}/depot_meta.php | 0 {config => unit/config}/depot_meta_perso.php | 0 {config => unit/config}/depot_metapack.php | 0 {config => unit/config}/expliquer_config.php | 0 {connect_sql => unit/connect_sql}/id_table_objet.php | 5 ++++- {connect_sql => unit/connect_sql}/objet_type.php | 5 ++++- .../connect_sql}/query_echappe_textes.php | 5 ++++- {connect_sql => unit/connect_sql}/table_objet.php | 5 ++++- {connect_sql => unit/connect_sql}/table_objet_sql.php | 5 ++++- {criteres => unit/criteres}/branche.html | 0 {criteres => unit/criteres}/origine_traduction.html | 0 {criteres => unit/criteres}/regexp-like.html | 0 {criteres => unit/criteres}/traduction.html | 0 {documents => unit/documents}/affichage_documents.html | 0 {editer_liens => unit/editer_liens}/objet_associable.php | 5 ++++- {editer_liens => unit/editer_liens}/objet_associer.php | 5 ++++- {editer_liens => unit/editer_liens}/objet_dissocier.php | 5 ++++- .../editer_liens}/objet_qualifier_liens.php | 5 ++++- .../entrees_sorties}/spip_nfslock.php | 5 ++++- {filtres => unit/filtres}/abs_url.html | 0 {filtres => unit/filtres}/affdate.php | 5 ++++- {filtres => unit/filtres}/affdate_court.php | 5 ++++- {filtres => unit/filtres}/affdate_debut_fin.php | 0 {filtres => unit/filtres}/affdate_heure.php | 5 ++++- {filtres => unit/filtres}/affdate_jourcourt.php | 5 ++++- {filtres => unit/filtres}/affdate_mois_annee.php | 5 ++++- {filtres => unit/filtres}/annee.php | 5 ++++- {filtres => unit/filtres}/antispam.php | 0 {filtres => unit/filtres}/appliquer_filtre.php | 5 ++++- {filtres => unit/filtres}/attribut_html.php | 5 ++++- {filtres => unit/filtres}/balise_img.php | 0 {filtres => unit/filtres}/chercher_filtre.php | 5 ++++- {filtres => unit/filtres}/code.php | 5 ++++- {filtres => unit/filtres}/corriger_entites_html.php | 0 {filtres => unit/filtres}/date_ical.php | 5 ++++- {filtres => unit/filtres}/date_interface.php | 5 ++++- {filtres => unit/filtres}/date_iso.php | 5 ++++- {filtres => unit/filtres}/date_relative.php | 0 {filtres => unit/filtres}/div.php | 0 {filtres => unit/filtres}/echapper_tags.php | 5 ++++- {filtres => unit/filtres}/entites_html.php | 5 ++++- {filtres => unit/filtres}/extraire_attribut.php | 5 ++++- {filtres => unit/filtres}/extraire_balise.php | 7 +++++-- {filtres => unit/filtres}/extraire_date.php | 5 ++++- {filtres => unit/filtres}/extraire_multi.php | 0 {filtres => unit/filtres}/filtrer_entites.php | 5 ++++- {filtres => unit/filtres}/form_hidden.html | 0 {filtres => unit/filtres}/form_hidden_arbo.php | 0 {filtres => unit/filtres}/form_hidden_html.php | 0 {filtres => unit/filtres}/form_hidden_libres.php | 0 {filtres => unit/filtres}/form_hidden_page.php | 0 {filtres => unit/filtres}/form_hidden_propres.php | 0 {filtres => unit/filtres}/form_hidden_propres_qs.php | 0 {filtres => unit/filtres}/form_hidden_standard.php | 0 {filtres => unit/filtres}/hauteur.php | 5 ++++- {filtres => unit/filtres}/heures.php | 5 ++++- {filtres => unit/filtres}/heures_minutes.php | 5 ++++- {filtres => unit/filtres}/inserer_attribut.php | 0 {filtres => unit/filtres}/jour.php | 5 ++++- {filtres => unit/filtres}/journum.php | 5 ++++- {filtres => unit/filtres}/largeur.php | 5 ++++- {filtres => unit/filtres}/lien_ou_expose.php | 0 {filtres => unit/filtres}/liens_absolus.php | 5 ++++- {filtres => unit/filtres}/liens_absolus_prive.php | 2 +- {filtres => unit/filtres}/liens_ouvrants.html | 0 {filtres => unit/filtres}/logique.html | 0 {filtres => unit/filtres}/minutes.php | 5 ++++- {filtres => unit/filtres}/modulo.php | 0 {filtres => unit/filtres}/moins.php | 0 {filtres => unit/filtres}/mois.php | 5 ++++- {filtres => unit/filtres}/mult.php | 0 {filtres => unit/filtres}/nom_jour.php | 5 ++++- {filtres => unit/filtres}/nom_mois.php | 5 ++++- {filtres => unit/filtres}/normaliser_date.php | 5 ++++- {filtres => unit/filtres}/plus.php | 0 {filtres => unit/filtres}/post_autobr.php | 0 {filtres => unit/filtres}/proteger_amp.php | 5 ++++- {filtres => unit/filtres}/recup_date.php | 5 ++++- {filtres => unit/filtres}/recup_heure.php | 5 ++++- {filtres => unit/filtres}/recuperer_numero.php | 5 ++++- {filtres => unit/filtres}/saison.php | 5 ++++- {filtres => unit/filtres}/secondes.php | 5 ++++- {filtres => unit/filtres}/sinon.php | 5 ++++- {filtres => unit/filtres}/spip_htmlentities.php | 0 {filtres => unit/filtres}/spip_htmlspecialchars.php | 0 {filtres => unit/filtres}/sql_in.php | 5 ++++- {filtres => unit/filtres}/suivre_liens.php | 5 ++++- {filtres => unit/filtres}/supprimer_numero.php | 5 ++++- {filtres => unit/filtres}/supprimer_tags.php | 5 ++++- {filtres => unit/filtres}/taille_en_octets.php | 5 ++++- {filtres => unit/filtres}/taille_image.php | 5 ++++- {filtres => unit/filtres}/texte_backend.php | 5 ++++- {filtres => unit/filtres}/texte_backendq.php | 5 ++++- {filtres => unit/filtres}/textebrut.php | 5 ++++- {filtres => unit/filtres}/typo.php | 5 ++++- {filtres => unit/filtres}/vider_date.php | 5 ++++- {filtres => unit/filtres}/wrap.php | 5 ++++- .../filtres_mime}/filtre_text_csv_dist.php | 5 ++++- {filtres_mime => unit/filtres_mime}/filtre_text_dist.php | 5 ++++- {formulaire_ => unit/formulaire_}/protege_champ.php | 0 {json => unit/json}/var2js.php | 0 {path => unit/path}/creer_chemin.php | 5 ++++- {plugin => unit/plugin}/dir_plugins_suppl.php | 0 {plugin => unit/plugin}/plugin_version_compatible.php | 0 {plugin => unit/plugin}/spip_version_compare.php | 0 {propre => unit/propre}/code-imbrique.php | 5 ++++- {propre => unit/propre}/doublons_notes.html | 0 {propre => unit/propre}/doublons_notes_fonctions.php | 0 {propre => unit/propre}/echappe_html.php | 5 ++++- {propre => unit/propre}/liens.php | 5 ++++- {propre => unit/propre}/liens_classes.php | 5 ++++- {propre => unit/propre}/notes.html | 0 {propre => unit/propre}/traiter_raccourcis.php | 5 ++++- {propre => unit/propre}/traiter_tableau.php | 5 ++++- {rubriques => unit/rubriques}/creer_rubrique_nommee.html | 0 {sql => unit/sql}/00_sql_create_drop_view.php | 5 ++++- {sql => unit/sql}/10_sql_insert_select.php | 5 ++++- {sql => unit/sql}/20_sql_update_delete.php | 5 ++++- {sql => unit/sql}/30_sql_alter.php | 5 ++++- {sql => unit/sql}/40_sql_divers.php | 5 ++++- {sql => unit/sql}/99_sql_types_tables_id.php | 6 ++++-- {sql => unit/sql}/inc-sql_datas.inc | 0 {syndication => unit/syndication}/analyse_atom.php | 5 ++++- {syndication => unit/syndication}/analyse_backend.php | 5 ++++- {syndication => unit/syndication}/analyse_rss.php | 5 ++++- {syndication => unit/syndication}/dailymotion.php | 5 ++++- {syndication => unit/syndication}/data/dailymotion.rss | 0 {syndication => unit/syndication}/data/libre-en-fete.rdf | 0 {syndication => unit/syndication}/data/test-atom1-1.xml | 0 {syndication => unit/syndication}/data/test-rss2-1.xml | 0 {syndication => unit/syndication}/flux.php | 5 ++++- {texte => unit/texte}/interdire_script.php | 5 ++++- {texte => unit/texte}/propre.php | 0 {utils => unit/utils}/parametre_url.php | 0 {utils => unit/utils}/tester_url_absolue.php | 0 {utils => unit/utils}/url_de_.php | 0 {xml => unit/xml}/spip_xml_parse.php | 5 ++++- {xml => unit/xml}/xmlhack.html | 0 {xml => unit/xml}/xmlhack_fonctions.php | 0 {xml => unit/xml}/xmlhack_inclure.html | 0 {xml => unit/xml}/xmlhack_inclure_dyn.html | 0 {xml => unit/xml}/xmlhack_inclure_dyn_php.html | 0 {xml => unit/xml}/xmlhack_inclure_php.html | 0 {xml => unit/xml}/xmlhack_php.html | 0 {xml => unit/xml}/xmlhack_php_fonctions.php | 0 {xml => unit/xml}/xmlhack_recuperer_fond.php | 9 ++++++--- {z_todo => unit/z_todo}/NA_echappements.php | 5 ++++- {z_todo => unit/z_todo}/NA_email_valide.php | 5 ++++- {z_todo => unit/z_todo}/NA_email_valide_5322.php | 5 ++++- {z_todo => unit/z_todo}/email_valide_5322.xml | 0 182 files changed, 350 insertions(+), 94 deletions(-) rename {balises => unit/balises}/autoriser.html (100%) rename {balises => unit/balises}/balise_dyn_langue.html (100%) rename {balises => unit/balises}/balise_dyn_langue_fonctions.php (100%) rename {balises => unit/balises}/balise_dyn_langue_modele.html (100%) rename {balises => unit/balises}/balise_dyn_langue_modele_fonctions.php (100%) rename {balises => unit/balises}/config.html (100%) rename {balises => unit/balises}/config_fonctions.php (100%) rename {balises => unit/balises}/doublons.html (100%) rename {balises => unit/balises}/expose.html (100%) rename {balises => unit/balises}/filtre.html (100%) rename {balises => unit/balises}/filtre_fonctions.php (100%) rename {balises => unit/balises}/formulaire_.html (100%) rename {balises => unit/balises}/formulaire__fonctions.php (100%) rename {balises => unit/balises}/inclure_array.html (100%) rename {balises => unit/balises}/inclure_manquant.html (100%) rename {balises => unit/balises}/inclure_manquant_fonctions.php (100%) rename {balises => unit/balises}/inclus_article.html (100%) rename {balises => unit/balises}/inclus_expose.html (100%) rename {balises => unit/balises}/inclus_rien.html (100%) rename {balises => unit/balises}/introduction.html (100%) rename {balises => unit/balises}/introduction_fonctions.php (100%) rename {balises => unit/balises}/lesauteurs.html (100%) rename {balises => unit/balises}/mime_type.html (100%) rename {balises => unit/balises}/notes.html (100%) rename {balises => unit/balises}/phraseur_balise_dyn.html (100%) rename {balises => unit/balises}/session.html (100%) rename {boucles => unit/boucles}/balise_detachee.html (100%) rename {boucles => unit/boucles}/boucle_vide.html (100%) rename {boucles => unit/boucles}/bug764.html (100%) rename {boucles => unit/boucles}/doublons.html (100%) rename {boucles => unit/boucles}/hierarchie.html (100%) rename {config => unit/config}/depot_meta.php (100%) rename {config => unit/config}/depot_meta_perso.php (100%) rename {config => unit/config}/depot_metapack.php (100%) rename {config => unit/config}/expliquer_config.php (100%) rename {connect_sql => unit/connect_sql}/id_table_objet.php (96%) rename {connect_sql => unit/connect_sql}/objet_type.php (96%) rename {connect_sql => unit/connect_sql}/query_echappe_textes.php (94%) rename {connect_sql => unit/connect_sql}/table_objet.php (96%) rename {connect_sql => unit/connect_sql}/table_objet_sql.php (96%) rename {criteres => unit/criteres}/branche.html (100%) rename {criteres => unit/criteres}/origine_traduction.html (100%) rename {criteres => unit/criteres}/regexp-like.html (100%) rename {criteres => unit/criteres}/traduction.html (100%) rename {documents => unit/documents}/affichage_documents.html (100%) rename {editer_liens => unit/editer_liens}/objet_associable.php (88%) rename {editer_liens => unit/editer_liens}/objet_associer.php (89%) rename {editer_liens => unit/editer_liens}/objet_dissocier.php (92%) rename {editer_liens => unit/editer_liens}/objet_qualifier_liens.php (91%) rename {entrees_sorties => unit/entrees_sorties}/spip_nfslock.php (87%) rename {filtres => unit/filtres}/abs_url.html (100%) rename {filtres => unit/filtres}/affdate.php (95%) rename {filtres => unit/filtres}/affdate_court.php (98%) rename {filtres => unit/filtres}/affdate_debut_fin.php (100%) rename {filtres => unit/filtres}/affdate_heure.php (98%) rename {filtres => unit/filtres}/affdate_jourcourt.php (98%) rename {filtres => unit/filtres}/affdate_mois_annee.php (98%) rename {filtres => unit/filtres}/annee.php (97%) rename {filtres => unit/filtres}/antispam.php (100%) rename {filtres => unit/filtres}/appliquer_filtre.php (85%) rename {filtres => unit/filtres}/attribut_html.php (87%) rename {filtres => unit/filtres}/balise_img.php (100%) rename {filtres => unit/filtres}/chercher_filtre.php (98%) rename {filtres => unit/filtres}/code.php (87%) rename {filtres => unit/filtres}/corriger_entites_html.php (100%) rename {filtres => unit/filtres}/date_ical.php (98%) rename {filtres => unit/filtres}/date_interface.php (98%) rename {filtres => unit/filtres}/date_iso.php (83%) rename {filtres => unit/filtres}/date_relative.php (100%) rename {filtres => unit/filtres}/div.php (100%) rename {filtres => unit/filtres}/echapper_tags.php (92%) rename {filtres => unit/filtres}/entites_html.php (95%) rename {filtres => unit/filtres}/extraire_attribut.php (99%) rename {filtres => unit/filtres}/extraire_balise.php (91%) rename {filtres => unit/filtres}/extraire_date.php (74%) rename {filtres => unit/filtres}/extraire_multi.php (100%) rename {filtres => unit/filtres}/filtrer_entites.php (92%) rename {filtres => unit/filtres}/form_hidden.html (100%) rename {filtres => unit/filtres}/form_hidden_arbo.php (100%) rename {filtres => unit/filtres}/form_hidden_html.php (100%) rename {filtres => unit/filtres}/form_hidden_libres.php (100%) rename {filtres => unit/filtres}/form_hidden_page.php (100%) rename {filtres => unit/filtres}/form_hidden_propres.php (100%) rename {filtres => unit/filtres}/form_hidden_propres_qs.php (100%) rename {filtres => unit/filtres}/form_hidden_standard.php (100%) rename {filtres => unit/filtres}/hauteur.php (87%) rename {filtres => unit/filtres}/heures.php (97%) rename {filtres => unit/filtres}/heures_minutes.php (97%) rename {filtres => unit/filtres}/inserer_attribut.php (100%) rename {filtres => unit/filtres}/jour.php (97%) rename {filtres => unit/filtres}/journum.php (97%) rename {filtres => unit/filtres}/largeur.php (87%) rename {filtres => unit/filtres}/lien_ou_expose.php (100%) rename {filtres => unit/filtres}/liens_absolus.php (90%) rename {filtres => unit/filtres}/liens_absolus_prive.php (83%) rename {filtres => unit/filtres}/liens_ouvrants.html (100%) rename {filtres => unit/filtres}/logique.html (100%) rename {filtres => unit/filtres}/minutes.php (97%) rename {filtres => unit/filtres}/modulo.php (100%) rename {filtres => unit/filtres}/moins.php (100%) rename {filtres => unit/filtres}/mois.php (97%) rename {filtres => unit/filtres}/mult.php (100%) rename {filtres => unit/filtres}/nom_jour.php (97%) rename {filtres => unit/filtres}/nom_mois.php (97%) rename {filtres => unit/filtres}/normaliser_date.php (99%) rename {filtres => unit/filtres}/plus.php (100%) rename {filtres => unit/filtres}/post_autobr.php (100%) rename {filtres => unit/filtres}/proteger_amp.php (92%) rename {filtres => unit/filtres}/recup_date.php (99%) rename {filtres => unit/filtres}/recup_heure.php (98%) rename {filtres => unit/filtres}/recuperer_numero.php (88%) rename {filtres => unit/filtres}/saison.php (97%) rename {filtres => unit/filtres}/secondes.php (97%) rename {filtres => unit/filtres}/sinon.php (99%) rename {filtres => unit/filtres}/spip_htmlentities.php (100%) rename {filtres => unit/filtres}/spip_htmlspecialchars.php (100%) rename {filtres => unit/filtres}/sql_in.php (86%) rename {filtres => unit/filtres}/suivre_liens.php (98%) rename {filtres => unit/filtres}/supprimer_numero.php (89%) rename {filtres => unit/filtres}/supprimer_tags.php (92%) rename {filtres => unit/filtres}/taille_en_octets.php (93%) rename {filtres => unit/filtres}/taille_image.php (90%) rename {filtres => unit/filtres}/texte_backend.php (92%) rename {filtres => unit/filtres}/texte_backendq.php (92%) rename {filtres => unit/filtres}/textebrut.php (80%) rename {filtres => unit/filtres}/typo.php (96%) rename {filtres => unit/filtres}/vider_date.php (98%) rename {filtres => unit/filtres}/wrap.php (86%) rename {filtres_mime => unit/filtres_mime}/filtre_text_csv_dist.php (97%) rename {filtres_mime => unit/filtres_mime}/filtre_text_dist.php (95%) rename {formulaire_ => unit/formulaire_}/protege_champ.php (100%) rename {json => unit/json}/var2js.php (100%) rename {path => unit/path}/creer_chemin.php (84%) rename {plugin => unit/plugin}/dir_plugins_suppl.php (100%) rename {plugin => unit/plugin}/plugin_version_compatible.php (100%) rename {plugin => unit/plugin}/spip_version_compare.php (100%) rename {propre => unit/propre}/code-imbrique.php (99%) rename {propre => unit/propre}/doublons_notes.html (100%) rename {propre => unit/propre}/doublons_notes_fonctions.php (100%) rename {propre => unit/propre}/echappe_html.php (98%) rename {propre => unit/propre}/liens.php (97%) rename {propre => unit/propre}/liens_classes.php (93%) rename {propre => unit/propre}/notes.html (100%) rename {propre => unit/propre}/traiter_raccourcis.php (93%) rename {propre => unit/propre}/traiter_tableau.php (97%) rename {rubriques => unit/rubriques}/creer_rubrique_nommee.html (100%) rename {sql => unit/sql}/00_sql_create_drop_view.php (91%) rename {sql => unit/sql}/10_sql_insert_select.php (98%) rename {sql => unit/sql}/20_sql_update_delete.php (93%) rename {sql => unit/sql}/30_sql_alter.php (98%) rename {sql => unit/sql}/40_sql_divers.php (96%) rename {sql => unit/sql}/99_sql_types_tables_id.php (96%) rename {sql => unit/sql}/inc-sql_datas.inc (100%) rename {syndication => unit/syndication}/analyse_atom.php (96%) rename {syndication => unit/syndication}/analyse_backend.php (76%) rename {syndication => unit/syndication}/analyse_rss.php (94%) rename {syndication => unit/syndication}/dailymotion.php (81%) rename {syndication => unit/syndication}/data/dailymotion.rss (100%) rename {syndication => unit/syndication}/data/libre-en-fete.rdf (100%) rename {syndication => unit/syndication}/data/test-atom1-1.xml (100%) rename {syndication => unit/syndication}/data/test-rss2-1.xml (100%) rename {syndication => unit/syndication}/flux.php (80%) rename {texte => unit/texte}/interdire_script.php (95%) rename {texte => unit/texte}/propre.php (100%) rename {utils => unit/utils}/parametre_url.php (100%) rename {utils => unit/utils}/tester_url_absolue.php (100%) rename {utils => unit/utils}/url_de_.php (100%) rename {xml => unit/xml}/spip_xml_parse.php (98%) rename {xml => unit/xml}/xmlhack.html (100%) rename {xml => unit/xml}/xmlhack_fonctions.php (100%) rename {xml => unit/xml}/xmlhack_inclure.html (100%) rename {xml => unit/xml}/xmlhack_inclure_dyn.html (100%) rename {xml => unit/xml}/xmlhack_inclure_dyn_php.html (100%) rename {xml => unit/xml}/xmlhack_inclure_php.html (100%) rename {xml => unit/xml}/xmlhack_php.html (100%) rename {xml => unit/xml}/xmlhack_php_fonctions.php (100%) rename {xml => unit/xml}/xmlhack_recuperer_fond.php (69%) rename {z_todo => unit/z_todo}/NA_echappements.php (96%) rename {z_todo => unit/z_todo}/NA_email_valide.php (98%) rename {z_todo => unit/z_todo}/NA_email_valide_5322.php (93%) rename {z_todo => unit/z_todo}/email_valide_5322.xml (100%) diff --git a/index.php b/index.php index ca68e8879f..a98033efca 100644 --- a/index.php +++ b/index.php @@ -11,7 +11,7 @@ spip_unlink(_DIR_TMP."testrunner.log"); // chercher les bases de tests - $bases = array('tests'); + $bases = array('tests/unit'); foreach (creer_chemin() as $d) { if ($d && @is_dir("${d}tests")) $bases[] = "${d}tests"; @@ -53,8 +53,7 @@ //ignorer le contenu du jeu de squelettes dédié aux tests if (stristr($test,'squelettes/')) continue; - if (stristr($test,'simpletest/')) - continue; + //ignorer le contenu des donnees de test if (stristr($test,'data/')) continue; diff --git a/balises/autoriser.html b/unit/balises/autoriser.html similarity index 100% rename from balises/autoriser.html rename to unit/balises/autoriser.html diff --git a/balises/balise_dyn_langue.html b/unit/balises/balise_dyn_langue.html similarity index 100% rename from balises/balise_dyn_langue.html rename to unit/balises/balise_dyn_langue.html diff --git a/balises/balise_dyn_langue_fonctions.php b/unit/balises/balise_dyn_langue_fonctions.php similarity index 100% rename from balises/balise_dyn_langue_fonctions.php rename to unit/balises/balise_dyn_langue_fonctions.php diff --git a/balises/balise_dyn_langue_modele.html b/unit/balises/balise_dyn_langue_modele.html similarity index 100% rename from balises/balise_dyn_langue_modele.html rename to unit/balises/balise_dyn_langue_modele.html diff --git a/balises/balise_dyn_langue_modele_fonctions.php b/unit/balises/balise_dyn_langue_modele_fonctions.php similarity index 100% rename from balises/balise_dyn_langue_modele_fonctions.php rename to unit/balises/balise_dyn_langue_modele_fonctions.php diff --git a/balises/config.html b/unit/balises/config.html similarity index 100% rename from balises/config.html rename to unit/balises/config.html diff --git a/balises/config_fonctions.php b/unit/balises/config_fonctions.php similarity index 100% rename from balises/config_fonctions.php rename to unit/balises/config_fonctions.php diff --git a/balises/doublons.html b/unit/balises/doublons.html similarity index 100% rename from balises/doublons.html rename to unit/balises/doublons.html diff --git a/balises/expose.html b/unit/balises/expose.html similarity index 100% rename from balises/expose.html rename to unit/balises/expose.html diff --git a/balises/filtre.html b/unit/balises/filtre.html similarity index 100% rename from balises/filtre.html rename to unit/balises/filtre.html diff --git a/balises/filtre_fonctions.php b/unit/balises/filtre_fonctions.php similarity index 100% rename from balises/filtre_fonctions.php rename to unit/balises/filtre_fonctions.php diff --git a/balises/formulaire_.html b/unit/balises/formulaire_.html similarity index 100% rename from balises/formulaire_.html rename to unit/balises/formulaire_.html diff --git a/balises/formulaire__fonctions.php b/unit/balises/formulaire__fonctions.php similarity index 100% rename from balises/formulaire__fonctions.php rename to unit/balises/formulaire__fonctions.php diff --git a/balises/inclure_array.html b/unit/balises/inclure_array.html similarity index 100% rename from balises/inclure_array.html rename to unit/balises/inclure_array.html diff --git a/balises/inclure_manquant.html b/unit/balises/inclure_manquant.html similarity index 100% rename from balises/inclure_manquant.html rename to unit/balises/inclure_manquant.html diff --git a/balises/inclure_manquant_fonctions.php b/unit/balises/inclure_manquant_fonctions.php similarity index 100% rename from balises/inclure_manquant_fonctions.php rename to unit/balises/inclure_manquant_fonctions.php diff --git a/balises/inclus_article.html b/unit/balises/inclus_article.html similarity index 100% rename from balises/inclus_article.html rename to unit/balises/inclus_article.html diff --git a/balises/inclus_expose.html b/unit/balises/inclus_expose.html similarity index 100% rename from balises/inclus_expose.html rename to unit/balises/inclus_expose.html diff --git a/balises/inclus_rien.html b/unit/balises/inclus_rien.html similarity index 100% rename from balises/inclus_rien.html rename to unit/balises/inclus_rien.html diff --git a/balises/introduction.html b/unit/balises/introduction.html similarity index 100% rename from balises/introduction.html rename to unit/balises/introduction.html diff --git a/balises/introduction_fonctions.php b/unit/balises/introduction_fonctions.php similarity index 100% rename from balises/introduction_fonctions.php rename to unit/balises/introduction_fonctions.php diff --git a/balises/lesauteurs.html b/unit/balises/lesauteurs.html similarity index 100% rename from balises/lesauteurs.html rename to unit/balises/lesauteurs.html diff --git a/balises/mime_type.html b/unit/balises/mime_type.html similarity index 100% rename from balises/mime_type.html rename to unit/balises/mime_type.html diff --git a/balises/notes.html b/unit/balises/notes.html similarity index 100% rename from balises/notes.html rename to unit/balises/notes.html diff --git a/balises/phraseur_balise_dyn.html b/unit/balises/phraseur_balise_dyn.html similarity index 100% rename from balises/phraseur_balise_dyn.html rename to unit/balises/phraseur_balise_dyn.html diff --git a/balises/session.html b/unit/balises/session.html similarity index 100% rename from balises/session.html rename to unit/balises/session.html diff --git a/boucles/balise_detachee.html b/unit/boucles/balise_detachee.html similarity index 100% rename from boucles/balise_detachee.html rename to unit/boucles/balise_detachee.html diff --git a/boucles/boucle_vide.html b/unit/boucles/boucle_vide.html similarity index 100% rename from boucles/boucle_vide.html rename to unit/boucles/boucle_vide.html diff --git a/boucles/bug764.html b/unit/boucles/bug764.html similarity index 100% rename from boucles/bug764.html rename to unit/boucles/bug764.html diff --git a/boucles/doublons.html b/unit/boucles/doublons.html similarity index 100% rename from boucles/doublons.html rename to unit/boucles/doublons.html diff --git a/boucles/hierarchie.html b/unit/boucles/hierarchie.html similarity index 100% rename from boucles/hierarchie.html rename to unit/boucles/hierarchie.html diff --git a/config/depot_meta.php b/unit/config/depot_meta.php similarity index 100% rename from config/depot_meta.php rename to unit/config/depot_meta.php diff --git a/config/depot_meta_perso.php b/unit/config/depot_meta_perso.php similarity index 100% rename from config/depot_meta_perso.php rename to unit/config/depot_meta_perso.php diff --git a/config/depot_metapack.php b/unit/config/depot_metapack.php similarity index 100% rename from config/depot_metapack.php rename to unit/config/depot_metapack.php diff --git a/config/expliquer_config.php b/unit/config/expliquer_config.php similarity index 100% rename from config/expliquer_config.php rename to unit/config/expliquer_config.php diff --git a/connect_sql/id_table_objet.php b/unit/connect_sql/id_table_objet.php similarity index 96% rename from connect_sql/id_table_objet.php rename to unit/connect_sql/id_table_objet.php index 638f064b6d..49c13c866e 100644 --- a/connect_sql/id_table_objet.php +++ b/unit/connect_sql/id_table_objet.php @@ -8,7 +8,10 @@ */ $test = 'id_table_objet'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("base/connect_sql.php",'',true); // diff --git a/connect_sql/objet_type.php b/unit/connect_sql/objet_type.php similarity index 96% rename from connect_sql/objet_type.php rename to unit/connect_sql/objet_type.php index 4f39891459..d03832fe92 100644 --- a/connect_sql/objet_type.php +++ b/unit/connect_sql/objet_type.php @@ -8,7 +8,10 @@ */ $test = 'objet_type'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("base/connect_sql.php",'',true); // diff --git a/connect_sql/query_echappe_textes.php b/unit/connect_sql/query_echappe_textes.php similarity index 94% rename from connect_sql/query_echappe_textes.php rename to unit/connect_sql/query_echappe_textes.php index e07e81620d..973b222cff 100644 --- a/connect_sql/query_echappe_textes.php +++ b/unit/connect_sql/query_echappe_textes.php @@ -1,7 +1,10 @@ <?php $test = 'query_echappe_textes'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("base/connect_sql.php",'',true); // diff --git a/connect_sql/table_objet.php b/unit/connect_sql/table_objet.php similarity index 96% rename from connect_sql/table_objet.php rename to unit/connect_sql/table_objet.php index b1bd6947a8..eaa0808242 100644 --- a/connect_sql/table_objet.php +++ b/unit/connect_sql/table_objet.php @@ -8,7 +8,10 @@ */ $test = 'table_objet'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("base/connect_sql.php",'',true); // diff --git a/connect_sql/table_objet_sql.php b/unit/connect_sql/table_objet_sql.php similarity index 96% rename from connect_sql/table_objet_sql.php rename to unit/connect_sql/table_objet_sql.php index 86c20bedcb..726f951d30 100644 --- a/connect_sql/table_objet_sql.php +++ b/unit/connect_sql/table_objet_sql.php @@ -8,7 +8,10 @@ */ $test = 'table_objet_sql'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("base/connect_sql.php",'',true); // diff --git a/criteres/branche.html b/unit/criteres/branche.html similarity index 100% rename from criteres/branche.html rename to unit/criteres/branche.html diff --git a/criteres/origine_traduction.html b/unit/criteres/origine_traduction.html similarity index 100% rename from criteres/origine_traduction.html rename to unit/criteres/origine_traduction.html diff --git a/criteres/regexp-like.html b/unit/criteres/regexp-like.html similarity index 100% rename from criteres/regexp-like.html rename to unit/criteres/regexp-like.html diff --git a/criteres/traduction.html b/unit/criteres/traduction.html similarity index 100% rename from criteres/traduction.html rename to unit/criteres/traduction.html diff --git a/documents/affichage_documents.html b/unit/documents/affichage_documents.html similarity index 100% rename from documents/affichage_documents.html rename to unit/documents/affichage_documents.html diff --git a/editer_liens/objet_associable.php b/unit/editer_liens/objet_associable.php similarity index 88% rename from editer_liens/objet_associable.php rename to unit/editer_liens/objet_associable.php index e1e6dac033..b21e99954d 100644 --- a/editer_liens/objet_associable.php +++ b/unit/editer_liens/objet_associable.php @@ -8,7 +8,10 @@ */ $test = 'objet_associable'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("action/editer_liens.php",'',true); // diff --git a/editer_liens/objet_associer.php b/unit/editer_liens/objet_associer.php similarity index 89% rename from editer_liens/objet_associer.php rename to unit/editer_liens/objet_associer.php index d77fa00def..244ce298a8 100644 --- a/editer_liens/objet_associer.php +++ b/unit/editer_liens/objet_associer.php @@ -8,7 +8,10 @@ */ $test = 'objet_associer'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("action/editer_liens.php",'',true); // diff --git a/editer_liens/objet_dissocier.php b/unit/editer_liens/objet_dissocier.php similarity index 92% rename from editer_liens/objet_dissocier.php rename to unit/editer_liens/objet_dissocier.php index 17e126d456..882c7165d2 100644 --- a/editer_liens/objet_dissocier.php +++ b/unit/editer_liens/objet_dissocier.php @@ -8,7 +8,10 @@ */ $test = 'objet_dissocier'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("action/editer_liens.php",'',true); // creer les donnees de depart diff --git a/editer_liens/objet_qualifier_liens.php b/unit/editer_liens/objet_qualifier_liens.php similarity index 91% rename from editer_liens/objet_qualifier_liens.php rename to unit/editer_liens/objet_qualifier_liens.php index c705935ed0..c1d6c1f87b 100644 --- a/editer_liens/objet_qualifier_liens.php +++ b/unit/editer_liens/objet_qualifier_liens.php @@ -8,7 +8,10 @@ */ $test = 'objet_qualifier_liens'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("action/editer_liens.php",'',true); // creer les donnees de depart diff --git a/entrees_sorties/spip_nfslock.php b/unit/entrees_sorties/spip_nfslock.php similarity index 87% rename from entrees_sorties/spip_nfslock.php rename to unit/entrees_sorties/spip_nfslock.php index 1895511500..8af3d83ae3 100644 --- a/entrees_sorties/spip_nfslock.php +++ b/unit/entrees_sorties/spip_nfslock.php @@ -1,7 +1,10 @@ <?php $test = 'spip_nfslock'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip("inc/nfslock"); $verrou = spip_nfslock('monfichier'); diff --git a/filtres/abs_url.html b/unit/filtres/abs_url.html similarity index 100% rename from filtres/abs_url.html rename to unit/filtres/abs_url.html diff --git a/filtres/affdate.php b/unit/filtres/affdate.php similarity index 95% rename from filtres/affdate.php rename to unit/filtres/affdate.php index df45e60b98..073dd18701 100644 --- a/filtres/affdate.php +++ b/unit/filtres/affdate.php @@ -1,7 +1,10 @@ <?php $test = 'affdate'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/filtres'); include_spip('inc/lang'); diff --git a/filtres/affdate_court.php b/unit/filtres/affdate_court.php similarity index 98% rename from filtres/affdate_court.php rename to unit/filtres/affdate_court.php index 9436c89b5e..317d6eeabc 100644 --- a/filtres/affdate_court.php +++ b/unit/filtres/affdate_court.php @@ -8,7 +8,10 @@ */ $test = 'affdate_court'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/affdate_debut_fin.php b/unit/filtres/affdate_debut_fin.php similarity index 100% rename from filtres/affdate_debut_fin.php rename to unit/filtres/affdate_debut_fin.php diff --git a/filtres/affdate_heure.php b/unit/filtres/affdate_heure.php similarity index 98% rename from filtres/affdate_heure.php rename to unit/filtres/affdate_heure.php index 531f5f1255..5473826cd9 100644 --- a/filtres/affdate_heure.php +++ b/unit/filtres/affdate_heure.php @@ -8,7 +8,10 @@ */ $test = 'affdate_heure'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/affdate_jourcourt.php b/unit/filtres/affdate_jourcourt.php similarity index 98% rename from filtres/affdate_jourcourt.php rename to unit/filtres/affdate_jourcourt.php index 994e94057a..b05db2951b 100644 --- a/filtres/affdate_jourcourt.php +++ b/unit/filtres/affdate_jourcourt.php @@ -8,7 +8,10 @@ */ $test = 'affdate_jourcourt'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/affdate_mois_annee.php b/unit/filtres/affdate_mois_annee.php similarity index 98% rename from filtres/affdate_mois_annee.php rename to unit/filtres/affdate_mois_annee.php index 36b83aa6ab..d731498161 100644 --- a/filtres/affdate_mois_annee.php +++ b/unit/filtres/affdate_mois_annee.php @@ -8,7 +8,10 @@ */ $test = 'affdate_mois_annee'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/annee.php b/unit/filtres/annee.php similarity index 97% rename from filtres/annee.php rename to unit/filtres/annee.php index c3ceb82f95..6415387758 100644 --- a/filtres/annee.php +++ b/unit/filtres/annee.php @@ -8,7 +8,10 @@ */ $test = 'annee'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/antispam.php b/unit/filtres/antispam.php similarity index 100% rename from filtres/antispam.php rename to unit/filtres/antispam.php diff --git a/filtres/appliquer_filtre.php b/unit/filtres/appliquer_filtre.php similarity index 85% rename from filtres/appliquer_filtre.php rename to unit/filtres/appliquer_filtre.php index 84256e0871..962094f17b 100644 --- a/filtres/appliquer_filtre.php +++ b/unit/filtres/appliquer_filtre.php @@ -8,7 +8,10 @@ */ $test = 'appliquer_filtre'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/attribut_html.php b/unit/filtres/attribut_html.php similarity index 87% rename from filtres/attribut_html.php rename to unit/filtres/attribut_html.php index 01a473ecbf..776fde5795 100644 --- a/filtres/attribut_html.php +++ b/unit/filtres/attribut_html.php @@ -2,7 +2,10 @@ $test = 'attribut_html'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip("inc/filtres"); $url = "/ecrire/?exec=exec&id_obj=id_obj&no_val"; diff --git a/filtres/balise_img.php b/unit/filtres/balise_img.php similarity index 100% rename from filtres/balise_img.php rename to unit/filtres/balise_img.php diff --git a/filtres/chercher_filtre.php b/unit/filtres/chercher_filtre.php similarity index 98% rename from filtres/chercher_filtre.php rename to unit/filtres/chercher_filtre.php index b77c044404..558c8afe5a 100644 --- a/filtres/chercher_filtre.php +++ b/unit/filtres/chercher_filtre.php @@ -8,7 +8,10 @@ */ $test = 'chercher_filtre'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/code.php b/unit/filtres/code.php similarity index 87% rename from filtres/code.php rename to unit/filtres/code.php index f38967045f..41201a6532 100644 --- a/filtres/code.php +++ b/unit/filtres/code.php @@ -1,7 +1,10 @@ <?php $test = 'extraire_attribut'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/texte'); lang_select('fr'); diff --git a/filtres/corriger_entites_html.php b/unit/filtres/corriger_entites_html.php similarity index 100% rename from filtres/corriger_entites_html.php rename to unit/filtres/corriger_entites_html.php diff --git a/filtres/date_ical.php b/unit/filtres/date_ical.php similarity index 98% rename from filtres/date_ical.php rename to unit/filtres/date_ical.php index f686016ab6..fe719c72a0 100644 --- a/filtres/date_ical.php +++ b/unit/filtres/date_ical.php @@ -8,7 +8,10 @@ */ $test = 'date_ical'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/date_interface.php b/unit/filtres/date_interface.php similarity index 98% rename from filtres/date_interface.php rename to unit/filtres/date_interface.php index f80414e18c..ffcda0f2e1 100644 --- a/filtres/date_interface.php +++ b/unit/filtres/date_interface.php @@ -8,7 +8,10 @@ */ $test = 'date_interface'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/date_iso.php b/unit/filtres/date_iso.php similarity index 83% rename from filtres/date_iso.php rename to unit/filtres/date_iso.php index 5d564ec37e..d8680aad52 100644 --- a/filtres/date_iso.php +++ b/unit/filtres/date_iso.php @@ -1,7 +1,10 @@ <?php $test = 'date_iso'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/filtres'); diff --git a/filtres/date_relative.php b/unit/filtres/date_relative.php similarity index 100% rename from filtres/date_relative.php rename to unit/filtres/date_relative.php diff --git a/filtres/div.php b/unit/filtres/div.php similarity index 100% rename from filtres/div.php rename to unit/filtres/div.php diff --git a/filtres/echapper_tags.php b/unit/filtres/echapper_tags.php similarity index 92% rename from filtres/echapper_tags.php rename to unit/filtres/echapper_tags.php index 8311282893..2acb06ef91 100644 --- a/filtres/echapper_tags.php +++ b/unit/filtres/echapper_tags.php @@ -8,7 +8,10 @@ */ $test = 'echapper_tags'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/entites_html.php b/unit/filtres/entites_html.php similarity index 95% rename from filtres/entites_html.php rename to unit/filtres/entites_html.php index 2910d3a856..bb2d6ce0b0 100644 --- a/filtres/entites_html.php +++ b/unit/filtres/entites_html.php @@ -2,7 +2,10 @@ $test = 'entites_html'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip("inc/filtres"); diff --git a/filtres/extraire_attribut.php b/unit/filtres/extraire_attribut.php similarity index 99% rename from filtres/extraire_attribut.php rename to unit/filtres/extraire_attribut.php index 4dbd553cbd..639d653cb6 100644 --- a/filtres/extraire_attribut.php +++ b/unit/filtres/extraire_attribut.php @@ -1,7 +1,10 @@ <?php $test = 'extraire_attribut'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/filtres'); diff --git a/filtres/extraire_balise.php b/unit/filtres/extraire_balise.php similarity index 91% rename from filtres/extraire_balise.php rename to unit/filtres/extraire_balise.php index 5d9ff16983..55d89700a2 100644 --- a/filtres/extraire_balise.php +++ b/unit/filtres/extraire_balise.php @@ -1,7 +1,10 @@ <?php $test = 'extraire_balise'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/filtres'); @@ -73,7 +76,7 @@ // un exemple d'utilisation sympa du mode "array" de ces fonctions: // aller chercher toutes les images d'un texte (img/src) ou encore // tous les url des balises media:content : - lire_fichier('tests/syndication/data/dailymotion.rss', $rss); + lire_fichier('tests/unit/syndication/data/dailymotion.rss', $rss); $flux = extraire_attribut(extraire_balises($rss, 'media:content'), 'url'); # var_dump($flux); if (!is_array($flux) OR !count($flux)==39) diff --git a/filtres/extraire_date.php b/unit/filtres/extraire_date.php similarity index 74% rename from filtres/extraire_date.php rename to unit/filtres/extraire_date.php index 7c5e042372..010f6505c6 100644 --- a/filtres/extraire_date.php +++ b/unit/filtres/extraire_date.php @@ -1,7 +1,10 @@ <?php $test = 'extraire_date'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/filtres'); diff --git a/filtres/extraire_multi.php b/unit/filtres/extraire_multi.php similarity index 100% rename from filtres/extraire_multi.php rename to unit/filtres/extraire_multi.php diff --git a/filtres/filtrer_entites.php b/unit/filtres/filtrer_entites.php similarity index 92% rename from filtres/filtrer_entites.php rename to unit/filtres/filtrer_entites.php index 4c88e624dd..cfbbf2a264 100644 --- a/filtres/filtrer_entites.php +++ b/unit/filtres/filtrer_entites.php @@ -8,7 +8,10 @@ */ $test = 'filtrer_entites'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/form_hidden.html b/unit/filtres/form_hidden.html similarity index 100% rename from filtres/form_hidden.html rename to unit/filtres/form_hidden.html diff --git a/filtres/form_hidden_arbo.php b/unit/filtres/form_hidden_arbo.php similarity index 100% rename from filtres/form_hidden_arbo.php rename to unit/filtres/form_hidden_arbo.php diff --git a/filtres/form_hidden_html.php b/unit/filtres/form_hidden_html.php similarity index 100% rename from filtres/form_hidden_html.php rename to unit/filtres/form_hidden_html.php diff --git a/filtres/form_hidden_libres.php b/unit/filtres/form_hidden_libres.php similarity index 100% rename from filtres/form_hidden_libres.php rename to unit/filtres/form_hidden_libres.php diff --git a/filtres/form_hidden_page.php b/unit/filtres/form_hidden_page.php similarity index 100% rename from filtres/form_hidden_page.php rename to unit/filtres/form_hidden_page.php diff --git a/filtres/form_hidden_propres.php b/unit/filtres/form_hidden_propres.php similarity index 100% rename from filtres/form_hidden_propres.php rename to unit/filtres/form_hidden_propres.php diff --git a/filtres/form_hidden_propres_qs.php b/unit/filtres/form_hidden_propres_qs.php similarity index 100% rename from filtres/form_hidden_propres_qs.php rename to unit/filtres/form_hidden_propres_qs.php diff --git a/filtres/form_hidden_standard.php b/unit/filtres/form_hidden_standard.php similarity index 100% rename from filtres/form_hidden_standard.php rename to unit/filtres/form_hidden_standard.php diff --git a/filtres/hauteur.php b/unit/filtres/hauteur.php similarity index 87% rename from filtres/hauteur.php rename to unit/filtres/hauteur.php index cb2e5fea1d..806bea0610 100644 --- a/filtres/hauteur.php +++ b/unit/filtres/hauteur.php @@ -8,7 +8,10 @@ */ $test = 'hauteur'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/heures.php b/unit/filtres/heures.php similarity index 97% rename from filtres/heures.php rename to unit/filtres/heures.php index 99d49b2461..eaf40202b5 100644 --- a/filtres/heures.php +++ b/unit/filtres/heures.php @@ -8,7 +8,10 @@ */ $test = 'heures'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/heures_minutes.php b/unit/filtres/heures_minutes.php similarity index 97% rename from filtres/heures_minutes.php rename to unit/filtres/heures_minutes.php index b79b7fd79c..aed8ce5aea 100644 --- a/filtres/heures_minutes.php +++ b/unit/filtres/heures_minutes.php @@ -8,7 +8,10 @@ */ $test = 'heures_minutes'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/inserer_attribut.php b/unit/filtres/inserer_attribut.php similarity index 100% rename from filtres/inserer_attribut.php rename to unit/filtres/inserer_attribut.php diff --git a/filtres/jour.php b/unit/filtres/jour.php similarity index 97% rename from filtres/jour.php rename to unit/filtres/jour.php index f47e8ebcd6..f84dfebf01 100644 --- a/filtres/jour.php +++ b/unit/filtres/jour.php @@ -8,7 +8,10 @@ */ $test = 'jour'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/journum.php b/unit/filtres/journum.php similarity index 97% rename from filtres/journum.php rename to unit/filtres/journum.php index 7defc64219..4c94fc1a7c 100644 --- a/filtres/journum.php +++ b/unit/filtres/journum.php @@ -8,7 +8,10 @@ */ $test = 'journum'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/largeur.php b/unit/filtres/largeur.php similarity index 87% rename from filtres/largeur.php rename to unit/filtres/largeur.php index d49ec237d1..1a0ffd8048 100644 --- a/filtres/largeur.php +++ b/unit/filtres/largeur.php @@ -8,7 +8,10 @@ */ $test = 'largeur'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/lien_ou_expose.php b/unit/filtres/lien_ou_expose.php similarity index 100% rename from filtres/lien_ou_expose.php rename to unit/filtres/lien_ou_expose.php diff --git a/filtres/liens_absolus.php b/unit/filtres/liens_absolus.php similarity index 90% rename from filtres/liens_absolus.php rename to unit/filtres/liens_absolus.php index bcc3745a5f..0f608c0418 100644 --- a/filtres/liens_absolus.php +++ b/unit/filtres/liens_absolus.php @@ -1,7 +1,10 @@ <?php (isset($test) && $test) || ($test = 'liens_absolus'); - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/filtres'); $essais["lien prive"] = diff --git a/filtres/liens_absolus_prive.php b/unit/filtres/liens_absolus_prive.php similarity index 83% rename from filtres/liens_absolus_prive.php rename to unit/filtres/liens_absolus_prive.php index 6a23995ef2..294f3e9af0 100644 --- a/filtres/liens_absolus_prive.php +++ b/unit/filtres/liens_absolus_prive.php @@ -5,7 +5,7 @@ * ceci avant que inc_version.php soit inclus ... */ // let's go ecrire/ -define('_SPIP_TEST_CHDIR', dirname(dirname(dirname(__FILE__))) . '/ecrire'); +define('_SPIP_TEST_CHDIR', dirname(dirname(dirname(dirname(__FILE__)))) . '/ecrire'); $test = 'liens_absolus_prive'; // si on rajoute ça ... diff --git a/filtres/liens_ouvrants.html b/unit/filtres/liens_ouvrants.html similarity index 100% rename from filtres/liens_ouvrants.html rename to unit/filtres/liens_ouvrants.html diff --git a/filtres/logique.html b/unit/filtres/logique.html similarity index 100% rename from filtres/logique.html rename to unit/filtres/logique.html diff --git a/filtres/minutes.php b/unit/filtres/minutes.php similarity index 97% rename from filtres/minutes.php rename to unit/filtres/minutes.php index 4a9391df3b..648b05cf05 100644 --- a/filtres/minutes.php +++ b/unit/filtres/minutes.php @@ -8,7 +8,10 @@ */ $test = 'minutes'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/modulo.php b/unit/filtres/modulo.php similarity index 100% rename from filtres/modulo.php rename to unit/filtres/modulo.php diff --git a/filtres/moins.php b/unit/filtres/moins.php similarity index 100% rename from filtres/moins.php rename to unit/filtres/moins.php diff --git a/filtres/mois.php b/unit/filtres/mois.php similarity index 97% rename from filtres/mois.php rename to unit/filtres/mois.php index 43111f61ed..a171d6f8e7 100644 --- a/filtres/mois.php +++ b/unit/filtres/mois.php @@ -8,7 +8,10 @@ */ $test = 'mois'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/mult.php b/unit/filtres/mult.php similarity index 100% rename from filtres/mult.php rename to unit/filtres/mult.php diff --git a/filtres/nom_jour.php b/unit/filtres/nom_jour.php similarity index 97% rename from filtres/nom_jour.php rename to unit/filtres/nom_jour.php index 01e4f81166..247e7f83d6 100644 --- a/filtres/nom_jour.php +++ b/unit/filtres/nom_jour.php @@ -8,7 +8,10 @@ */ $test = 'nom_jour'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/nom_mois.php b/unit/filtres/nom_mois.php similarity index 97% rename from filtres/nom_mois.php rename to unit/filtres/nom_mois.php index d27bfd3f45..7752d9e79e 100644 --- a/filtres/nom_mois.php +++ b/unit/filtres/nom_mois.php @@ -8,7 +8,10 @@ */ $test = 'nom_mois'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/normaliser_date.php b/unit/filtres/normaliser_date.php similarity index 99% rename from filtres/normaliser_date.php rename to unit/filtres/normaliser_date.php index 54552e01ac..9274478a5c 100644 --- a/filtres/normaliser_date.php +++ b/unit/filtres/normaliser_date.php @@ -8,7 +8,10 @@ */ $test = 'normaliser_date'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/plus.php b/unit/filtres/plus.php similarity index 100% rename from filtres/plus.php rename to unit/filtres/plus.php diff --git a/filtres/post_autobr.php b/unit/filtres/post_autobr.php similarity index 100% rename from filtres/post_autobr.php rename to unit/filtres/post_autobr.php diff --git a/filtres/proteger_amp.php b/unit/filtres/proteger_amp.php similarity index 92% rename from filtres/proteger_amp.php rename to unit/filtres/proteger_amp.php index 9c8e703366..620144ee96 100644 --- a/filtres/proteger_amp.php +++ b/unit/filtres/proteger_amp.php @@ -8,7 +8,10 @@ */ $test = 'proteger_amp'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/recup_date.php b/unit/filtres/recup_date.php similarity index 99% rename from filtres/recup_date.php rename to unit/filtres/recup_date.php index 1159edc586..443ec2d0fc 100644 --- a/filtres/recup_date.php +++ b/unit/filtres/recup_date.php @@ -8,7 +8,10 @@ */ $test = 'recup_date'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/recup_heure.php b/unit/filtres/recup_heure.php similarity index 98% rename from filtres/recup_heure.php rename to unit/filtres/recup_heure.php index 9b5c90e4de..5c640795d7 100644 --- a/filtres/recup_heure.php +++ b/unit/filtres/recup_heure.php @@ -8,7 +8,10 @@ */ $test = 'recup_heure'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/recuperer_numero.php b/unit/filtres/recuperer_numero.php similarity index 88% rename from filtres/recuperer_numero.php rename to unit/filtres/recuperer_numero.php index 08bc4c3c08..8020b57ae1 100644 --- a/filtres/recuperer_numero.php +++ b/unit/filtres/recuperer_numero.php @@ -8,7 +8,10 @@ */ $test = 'recuperer_numero'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/saison.php b/unit/filtres/saison.php similarity index 97% rename from filtres/saison.php rename to unit/filtres/saison.php index d1a9ec7e8c..76fc200264 100644 --- a/filtres/saison.php +++ b/unit/filtres/saison.php @@ -8,7 +8,10 @@ */ $test = 'saison'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/secondes.php b/unit/filtres/secondes.php similarity index 97% rename from filtres/secondes.php rename to unit/filtres/secondes.php index 0fb901dc94..3548345b02 100644 --- a/filtres/secondes.php +++ b/unit/filtres/secondes.php @@ -8,7 +8,10 @@ */ $test = 'secondes'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/sinon.php b/unit/filtres/sinon.php similarity index 99% rename from filtres/sinon.php rename to unit/filtres/sinon.php index 417ad6a69d..3bf29462aa 100644 --- a/filtres/sinon.php +++ b/unit/filtres/sinon.php @@ -8,7 +8,10 @@ */ $test = 'sinon'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/spip_htmlentities.php b/unit/filtres/spip_htmlentities.php similarity index 100% rename from filtres/spip_htmlentities.php rename to unit/filtres/spip_htmlentities.php diff --git a/filtres/spip_htmlspecialchars.php b/unit/filtres/spip_htmlspecialchars.php similarity index 100% rename from filtres/spip_htmlspecialchars.php rename to unit/filtres/spip_htmlspecialchars.php diff --git a/filtres/sql_in.php b/unit/filtres/sql_in.php similarity index 86% rename from filtres/sql_in.php rename to unit/filtres/sql_in.php index f43415e9d6..7b05b72616 100644 --- a/filtres/sql_in.php +++ b/unit/filtres/sql_in.php @@ -1,6 +1,9 @@ <?php - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('base/abstract_sql'); if (function_exists('sql_in')) diff --git a/filtres/suivre_liens.php b/unit/filtres/suivre_liens.php similarity index 98% rename from filtres/suivre_liens.php rename to unit/filtres/suivre_liens.php index 53066cd793..b0dc747b2e 100644 --- a/filtres/suivre_liens.php +++ b/unit/filtres/suivre_liens.php @@ -1,7 +1,10 @@ <?php (isset($test) && $test) || ($test = 'suivre_liens'); - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/filtres'); # source # lien # resultat diff --git a/filtres/supprimer_numero.php b/unit/filtres/supprimer_numero.php similarity index 89% rename from filtres/supprimer_numero.php rename to unit/filtres/supprimer_numero.php index 5bc0d20b33..e862ca906f 100644 --- a/filtres/supprimer_numero.php +++ b/unit/filtres/supprimer_numero.php @@ -8,7 +8,10 @@ */ $test = 'supprimer_numero'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/supprimer_tags.php b/unit/filtres/supprimer_tags.php similarity index 92% rename from filtres/supprimer_tags.php rename to unit/filtres/supprimer_tags.php index 2288a1e32d..597ddfe747 100644 --- a/filtres/supprimer_tags.php +++ b/unit/filtres/supprimer_tags.php @@ -8,7 +8,10 @@ */ $test = 'supprimer_tags'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/taille_en_octets.php b/unit/filtres/taille_en_octets.php similarity index 93% rename from filtres/taille_en_octets.php rename to unit/filtres/taille_en_octets.php index 32c376dd83..512802f77e 100644 --- a/filtres/taille_en_octets.php +++ b/unit/filtres/taille_en_octets.php @@ -8,7 +8,10 @@ */ $test = 'taille_en_octets'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/taille_image.php b/unit/filtres/taille_image.php similarity index 90% rename from filtres/taille_image.php rename to unit/filtres/taille_image.php index c1c7548c7b..cd938ffc66 100644 --- a/filtres/taille_image.php +++ b/unit/filtres/taille_image.php @@ -8,7 +8,10 @@ */ $test = 'taille_image'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/texte_backend.php b/unit/filtres/texte_backend.php similarity index 92% rename from filtres/texte_backend.php rename to unit/filtres/texte_backend.php index e323206fa0..d71b01e8ed 100644 --- a/filtres/texte_backend.php +++ b/unit/filtres/texte_backend.php @@ -8,7 +8,10 @@ */ $test = 'texte_backend'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/texte_backendq.php b/unit/filtres/texte_backendq.php similarity index 92% rename from filtres/texte_backendq.php rename to unit/filtres/texte_backendq.php index 513d364948..dcb5cef297 100644 --- a/filtres/texte_backendq.php +++ b/unit/filtres/texte_backendq.php @@ -8,7 +8,10 @@ */ $test = 'texte_backendq'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/textebrut.php b/unit/filtres/textebrut.php similarity index 80% rename from filtres/textebrut.php rename to unit/filtres/textebrut.php index 135e9ef2c4..550379815a 100644 --- a/filtres/textebrut.php +++ b/unit/filtres/textebrut.php @@ -8,7 +8,10 @@ */ $test = 'textebrut'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/typo.php b/unit/filtres/typo.php similarity index 96% rename from filtres/typo.php rename to unit/filtres/typo.php index 27a536fe0d..44c2995a59 100644 --- a/filtres/typo.php +++ b/unit/filtres/typo.php @@ -1,7 +1,10 @@ <?php $test = 'typo'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/texte'); diff --git a/filtres/vider_date.php b/unit/filtres/vider_date.php similarity index 98% rename from filtres/vider_date.php rename to unit/filtres/vider_date.php index 17d8123c44..4f6970c2e3 100644 --- a/filtres/vider_date.php +++ b/unit/filtres/vider_date.php @@ -8,7 +8,10 @@ */ $test = 'vider_date'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres/wrap.php b/unit/filtres/wrap.php similarity index 86% rename from filtres/wrap.php rename to unit/filtres/wrap.php index b6d8aa4bc0..8a7f240ad8 100644 --- a/filtres/wrap.php +++ b/unit/filtres/wrap.php @@ -8,7 +8,10 @@ */ $test = 'wrap'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres.php",'',true); // diff --git a/filtres_mime/filtre_text_csv_dist.php b/unit/filtres_mime/filtre_text_csv_dist.php similarity index 97% rename from filtres_mime/filtre_text_csv_dist.php rename to unit/filtres_mime/filtre_text_csv_dist.php index 3dbede3b63..b7d77ce5c4 100644 --- a/filtres_mime/filtre_text_csv_dist.php +++ b/unit/filtres_mime/filtre_text_csv_dist.php @@ -8,7 +8,10 @@ */ $test = 'filtre_text_csv_dist'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres_mime.php",'',true); // diff --git a/filtres_mime/filtre_text_dist.php b/unit/filtres_mime/filtre_text_dist.php similarity index 95% rename from filtres_mime/filtre_text_dist.php rename to unit/filtres_mime/filtre_text_dist.php index 375a2321a7..982215b9cb 100644 --- a/filtres_mime/filtre_text_dist.php +++ b/unit/filtres_mime/filtre_text_dist.php @@ -8,7 +8,10 @@ */ $test = 'filtre_text_txt_dist'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; find_in_path("inc/filtres_mime.php",'',true); // diff --git a/formulaire_/protege_champ.php b/unit/formulaire_/protege_champ.php similarity index 100% rename from formulaire_/protege_champ.php rename to unit/formulaire_/protege_champ.php diff --git a/json/var2js.php b/unit/json/var2js.php similarity index 100% rename from json/var2js.php rename to unit/json/var2js.php diff --git a/path/creer_chemin.php b/unit/path/creer_chemin.php similarity index 84% rename from path/creer_chemin.php rename to unit/path/creer_chemin.php index 2604dbd823..929172cda9 100644 --- a/path/creer_chemin.php +++ b/unit/path/creer_chemin.php @@ -1,7 +1,10 @@ <?php $test = 'chemin'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; $n = count(explode(":",$GLOBALS['dossier_squelettes'])); diff --git a/plugin/dir_plugins_suppl.php b/unit/plugin/dir_plugins_suppl.php similarity index 100% rename from plugin/dir_plugins_suppl.php rename to unit/plugin/dir_plugins_suppl.php diff --git a/plugin/plugin_version_compatible.php b/unit/plugin/plugin_version_compatible.php similarity index 100% rename from plugin/plugin_version_compatible.php rename to unit/plugin/plugin_version_compatible.php diff --git a/plugin/spip_version_compare.php b/unit/plugin/spip_version_compare.php similarity index 100% rename from plugin/spip_version_compare.php rename to unit/plugin/spip_version_compare.php diff --git a/propre/code-imbrique.php b/unit/propre/code-imbrique.php similarity index 99% rename from propre/code-imbrique.php rename to unit/propre/code-imbrique.php index 9472f6c15c..3f477f5816 100644 --- a/propre/code-imbrique.php +++ b/unit/propre/code-imbrique.php @@ -1,7 +1,10 @@ <?php $test = 'Ne pas crasher sur les <code><code></code> imbriqués'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/texte'); diff --git a/propre/doublons_notes.html b/unit/propre/doublons_notes.html similarity index 100% rename from propre/doublons_notes.html rename to unit/propre/doublons_notes.html diff --git a/propre/doublons_notes_fonctions.php b/unit/propre/doublons_notes_fonctions.php similarity index 100% rename from propre/doublons_notes_fonctions.php rename to unit/propre/doublons_notes_fonctions.php diff --git a/propre/echappe_html.php b/unit/propre/echappe_html.php similarity index 98% rename from propre/echappe_html.php rename to unit/propre/echappe_html.php index b73cd81e5f..e9ffeab1d3 100644 --- a/propre/echappe_html.php +++ b/unit/propre/echappe_html.php @@ -1,7 +1,10 @@ <?php $test = 'echappe_html'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/texte'); diff --git a/propre/liens.php b/unit/propre/liens.php similarity index 97% rename from propre/liens.php rename to unit/propre/liens.php index 80f5cea37c..9cc0fc43ce 100644 --- a/propre/liens.php +++ b/unit/propre/liens.php @@ -2,7 +2,10 @@ define('_ESPACE_PRIVE',1); // pour tester le modele inexistant, qui sera sinon ignore $test = 'liens'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/texte'); include_spip('inc/lang'); diff --git a/propre/liens_classes.php b/unit/propre/liens_classes.php similarity index 93% rename from propre/liens_classes.php rename to unit/propre/liens_classes.php index 8df6e0b500..ae8bac7e4b 100644 --- a/propre/liens_classes.php +++ b/unit/propre/liens_classes.php @@ -1,7 +1,10 @@ <?php $test = 'liens_classes'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/texte'); include_spip('inc/lang'); diff --git a/propre/notes.html b/unit/propre/notes.html similarity index 100% rename from propre/notes.html rename to unit/propre/notes.html diff --git a/propre/traiter_raccourcis.php b/unit/propre/traiter_raccourcis.php similarity index 93% rename from propre/traiter_raccourcis.php rename to unit/propre/traiter_raccourcis.php index d8d9bf5b91..784e5beef2 100644 --- a/propre/traiter_raccourcis.php +++ b/unit/propre/traiter_raccourcis.php @@ -1,7 +1,10 @@ <?php $test = 'traiter_raccourcis'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; // ces tests sont prevus pour la variable de personnalisation : $GLOBALS['toujours_paragrapher'] = false; diff --git a/propre/traiter_tableau.php b/unit/propre/traiter_tableau.php similarity index 97% rename from propre/traiter_tableau.php rename to unit/propre/traiter_tableau.php index 36be3acc30..7fdc3d6211 100644 --- a/propre/traiter_tableau.php +++ b/unit/propre/traiter_tableau.php @@ -1,7 +1,10 @@ <?php $test = 'traiter_tableau'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/texte'); diff --git a/rubriques/creer_rubrique_nommee.html b/unit/rubriques/creer_rubrique_nommee.html similarity index 100% rename from rubriques/creer_rubrique_nommee.html rename to unit/rubriques/creer_rubrique_nommee.html diff --git a/sql/00_sql_create_drop_view.php b/unit/sql/00_sql_create_drop_view.php similarity index 91% rename from sql/00_sql_create_drop_view.php rename to unit/sql/00_sql_create_drop_view.php index 8d5866780f..fd9cf1ba66 100644 --- a/sql/00_sql_create_drop_view.php +++ b/unit/sql/00_sql_create_drop_view.php @@ -1,6 +1,9 @@ <?php - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include 'inc-sql_datas.inc'; include_spip('base/abstract_sql'); diff --git a/sql/10_sql_insert_select.php b/unit/sql/10_sql_insert_select.php similarity index 98% rename from sql/10_sql_insert_select.php rename to unit/sql/10_sql_insert_select.php index 62760f59eb..85f7cd0530 100644 --- a/sql/10_sql_insert_select.php +++ b/unit/sql/10_sql_insert_select.php @@ -1,6 +1,9 @@ <?php - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include 'inc-sql_datas.inc'; include_spip('base/abstract_sql'); diff --git a/sql/20_sql_update_delete.php b/unit/sql/20_sql_update_delete.php similarity index 93% rename from sql/20_sql_update_delete.php rename to unit/sql/20_sql_update_delete.php index 01cee74eb5..4943efa072 100644 --- a/sql/20_sql_update_delete.php +++ b/unit/sql/20_sql_update_delete.php @@ -1,6 +1,9 @@ <?php - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include 'inc-sql_datas.inc'; include_spip('base/abstract_sql'); diff --git a/sql/30_sql_alter.php b/unit/sql/30_sql_alter.php similarity index 98% rename from sql/30_sql_alter.php rename to unit/sql/30_sql_alter.php index 61cca83592..9052f98961 100644 --- a/sql/30_sql_alter.php +++ b/unit/sql/30_sql_alter.php @@ -1,6 +1,9 @@ <?php - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include 'inc-sql_datas.inc'; include_spip('base/abstract_sql'); diff --git a/sql/40_sql_divers.php b/unit/sql/40_sql_divers.php similarity index 96% rename from sql/40_sql_divers.php rename to unit/sql/40_sql_divers.php index befa7a6c2d..4b60499af9 100644 --- a/sql/40_sql_divers.php +++ b/unit/sql/40_sql_divers.php @@ -1,6 +1,9 @@ <?php - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include 'inc-sql_datas.inc'; include_spip('base/abstract_sql'); diff --git a/sql/99_sql_types_tables_id.php b/unit/sql/99_sql_types_tables_id.php similarity index 96% rename from sql/99_sql_types_tables_id.php rename to unit/sql/99_sql_types_tables_id.php index 1d9605df1e..f4bafbb96c 100644 --- a/sql/99_sql_types_tables_id.php +++ b/unit/sql/99_sql_types_tables_id.php @@ -1,7 +1,9 @@ <?php - $test = 'table_objet'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('base/connect_sql'); diff --git a/sql/inc-sql_datas.inc b/unit/sql/inc-sql_datas.inc similarity index 100% rename from sql/inc-sql_datas.inc rename to unit/sql/inc-sql_datas.inc diff --git a/syndication/analyse_atom.php b/unit/syndication/analyse_atom.php similarity index 96% rename from syndication/analyse_atom.php rename to unit/syndication/analyse_atom.php index dab9124865..f9a226982b 100644 --- a/syndication/analyse_atom.php +++ b/unit/syndication/analyse_atom.php @@ -29,7 +29,10 @@ dans les items $test = 'analyse_atom'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/syndic'); $GLOBALS['controler_dates_rss'] = false; diff --git a/syndication/analyse_backend.php b/unit/syndication/analyse_backend.php similarity index 76% rename from syndication/analyse_backend.php rename to unit/syndication/analyse_backend.php index 891af1fe7b..bb2e0a63f3 100644 --- a/syndication/analyse_backend.php +++ b/unit/syndication/analyse_backend.php @@ -1,7 +1,10 @@ <?php $test = 'flux'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/syndic'); $GLOBALS['controler_dates_rss'] = false; diff --git a/syndication/analyse_rss.php b/unit/syndication/analyse_rss.php similarity index 94% rename from syndication/analyse_rss.php rename to unit/syndication/analyse_rss.php index 0da5ed3a08..e6d99eb331 100644 --- a/syndication/analyse_rss.php +++ b/unit/syndication/analyse_rss.php @@ -29,7 +29,10 @@ dans les items $test = 'flux'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/syndic'); $GLOBALS['controler_dates_rss'] = false; diff --git a/syndication/dailymotion.php b/unit/syndication/dailymotion.php similarity index 81% rename from syndication/dailymotion.php rename to unit/syndication/dailymotion.php index 36e2f5fbd6..126b1ad214 100644 --- a/syndication/dailymotion.php +++ b/unit/syndication/dailymotion.php @@ -5,7 +5,10 @@ */ $test = 'dailymotion.rss'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/syndic'); $GLOBALS['controler_dates_rss'] = false; diff --git a/syndication/data/dailymotion.rss b/unit/syndication/data/dailymotion.rss similarity index 100% rename from syndication/data/dailymotion.rss rename to unit/syndication/data/dailymotion.rss diff --git a/syndication/data/libre-en-fete.rdf b/unit/syndication/data/libre-en-fete.rdf similarity index 100% rename from syndication/data/libre-en-fete.rdf rename to unit/syndication/data/libre-en-fete.rdf diff --git a/syndication/data/test-atom1-1.xml b/unit/syndication/data/test-atom1-1.xml similarity index 100% rename from syndication/data/test-atom1-1.xml rename to unit/syndication/data/test-atom1-1.xml diff --git a/syndication/data/test-rss2-1.xml b/unit/syndication/data/test-rss2-1.xml similarity index 100% rename from syndication/data/test-rss2-1.xml rename to unit/syndication/data/test-rss2-1.xml diff --git a/syndication/flux.php b/unit/syndication/flux.php similarity index 80% rename from syndication/flux.php rename to unit/syndication/flux.php index b57daf01a8..e4b7e844b3 100644 --- a/syndication/flux.php +++ b/unit/syndication/flux.php @@ -1,7 +1,10 @@ <?php $test = 'flux'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/syndic'); diff --git a/texte/interdire_script.php b/unit/texte/interdire_script.php similarity index 95% rename from texte/interdire_script.php rename to unit/texte/interdire_script.php index 848dd7156c..9d1d91713e 100644 --- a/texte/interdire_script.php +++ b/unit/texte/interdire_script.php @@ -2,7 +2,10 @@ $test = 'attribut_html'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip("inc/texte"); $GLOBALS['filtrer_javascript'] = 1; diff --git a/texte/propre.php b/unit/texte/propre.php similarity index 100% rename from texte/propre.php rename to unit/texte/propre.php diff --git a/utils/parametre_url.php b/unit/utils/parametre_url.php similarity index 100% rename from utils/parametre_url.php rename to unit/utils/parametre_url.php diff --git a/utils/tester_url_absolue.php b/unit/utils/tester_url_absolue.php similarity index 100% rename from utils/tester_url_absolue.php rename to unit/utils/tester_url_absolue.php diff --git a/utils/url_de_.php b/unit/utils/url_de_.php similarity index 100% rename from utils/url_de_.php rename to unit/utils/url_de_.php diff --git a/xml/spip_xml_parse.php b/unit/xml/spip_xml_parse.php similarity index 98% rename from xml/spip_xml_parse.php rename to unit/xml/spip_xml_parse.php index 333f1078f9..34129c66a1 100644 --- a/xml/spip_xml_parse.php +++ b/unit/xml/spip_xml_parse.php @@ -1,7 +1,10 @@ <?php $test = 'spip_xml_parse'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip("inc/xml"); function seralize_parse($texte){ return serialize(spip_xml_parse($texte)); diff --git a/xml/xmlhack.html b/unit/xml/xmlhack.html similarity index 100% rename from xml/xmlhack.html rename to unit/xml/xmlhack.html diff --git a/xml/xmlhack_fonctions.php b/unit/xml/xmlhack_fonctions.php similarity index 100% rename from xml/xmlhack_fonctions.php rename to unit/xml/xmlhack_fonctions.php diff --git a/xml/xmlhack_inclure.html b/unit/xml/xmlhack_inclure.html similarity index 100% rename from xml/xmlhack_inclure.html rename to unit/xml/xmlhack_inclure.html diff --git a/xml/xmlhack_inclure_dyn.html b/unit/xml/xmlhack_inclure_dyn.html similarity index 100% rename from xml/xmlhack_inclure_dyn.html rename to unit/xml/xmlhack_inclure_dyn.html diff --git a/xml/xmlhack_inclure_dyn_php.html b/unit/xml/xmlhack_inclure_dyn_php.html similarity index 100% rename from xml/xmlhack_inclure_dyn_php.html rename to unit/xml/xmlhack_inclure_dyn_php.html diff --git a/xml/xmlhack_inclure_php.html b/unit/xml/xmlhack_inclure_php.html similarity index 100% rename from xml/xmlhack_inclure_php.html rename to unit/xml/xmlhack_inclure_php.html diff --git a/xml/xmlhack_php.html b/unit/xml/xmlhack_php.html similarity index 100% rename from xml/xmlhack_php.html rename to unit/xml/xmlhack_php.html diff --git a/xml/xmlhack_php_fonctions.php b/unit/xml/xmlhack_php_fonctions.php similarity index 100% rename from xml/xmlhack_php_fonctions.php rename to unit/xml/xmlhack_php_fonctions.php diff --git a/xml/xmlhack_recuperer_fond.php b/unit/xml/xmlhack_recuperer_fond.php similarity index 69% rename from xml/xmlhack_recuperer_fond.php rename to unit/xml/xmlhack_recuperer_fond.php index 61b0a712b1..7dbf88ee15 100644 --- a/xml/xmlhack_recuperer_fond.php +++ b/unit/xml/xmlhack_recuperer_fond.php @@ -1,10 +1,13 @@ <?php $test = 'xmlhack_recuperer_fond'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('public/assembler'); - $out = recuperer_fond(basename(_SPIP_TEST_INC).'/xml/xmlhack'); + $out = recuperer_fond(basename(_SPIP_TEST_INC).'/unit/xml/xmlhack'); // regarder si le hack a marche include_spip('inc/xml'); $tree = spip_xml_parse($out); @@ -13,7 +16,7 @@ if ($ok!=='OK') { echo ('<dl> Erreur sur le xml produit (xmlhack) : ' . serialize($tree) . '</dl>'); } - $out = recuperer_fond(basename(_SPIP_TEST_INC).'/xml/xmlhack_php'); + $out = recuperer_fond(basename(_SPIP_TEST_INC).'/unit/xml/xmlhack_php'); // regarder si le hack a marche include_spip('inc/xml'); $tree = spip_xml_parse($out); diff --git a/z_todo/NA_echappements.php b/unit/z_todo/NA_echappements.php similarity index 96% rename from z_todo/NA_echappements.php rename to unit/z_todo/NA_echappements.php index 0a7e90a374..c0cc41b86c 100644 --- a/z_todo/NA_echappements.php +++ b/unit/z_todo/NA_echappements.php @@ -1,7 +1,10 @@ <?php $test = 'echapper'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/texte'); // liste de codes qui doivent etre preserves par des allers-retours d'echappement diff --git a/z_todo/NA_email_valide.php b/unit/z_todo/NA_email_valide.php similarity index 98% rename from z_todo/NA_email_valide.php rename to unit/z_todo/NA_email_valide.php index 65527cfa3e..5b9972a6a3 100644 --- a/z_todo/NA_email_valide.php +++ b/unit/z_todo/NA_email_valide.php @@ -1,7 +1,10 @@ <?php $test = 'email_valide'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/filtres'); ?> diff --git a/z_todo/NA_email_valide_5322.php b/unit/z_todo/NA_email_valide_5322.php similarity index 93% rename from z_todo/NA_email_valide_5322.php rename to unit/z_todo/NA_email_valide_5322.php index 9f7a0c55bf..75ab6d969b 100644 --- a/z_todo/NA_email_valide_5322.php +++ b/unit/z_todo/NA_email_valide_5322.php @@ -8,7 +8,10 @@ */ $test = 'email_valider_5322'; - require '../test.inc'; + $remonte = "../"; + while (!is_dir($remonte."ecrire")) + $remonte = "../$remonte"; + require $remonte.'tests/test.inc'; include_spip('inc/filtres'); diff --git a/z_todo/email_valide_5322.xml b/unit/z_todo/email_valide_5322.xml similarity index 100% rename from z_todo/email_valide_5322.xml rename to unit/z_todo/email_valide_5322.xml -- GitLab