From 9a640def0a56b35aaca5f741bc1ac0165bccda0a Mon Sep 17 00:00:00 2001 From: JamesRezo <james@rezo.net> Date: Mon, 31 May 2021 23:15:44 +0200 Subject: [PATCH] =?UTF-8?q?fix=20#4804:=20d=C3=A9placer=20les=20tests=20de?= =?UTF-8?q?s=20plugins=20non-dist=20dans=20leurs=20d=C3=A9p=C3=B4ts=20resp?= =?UTF-8?q?ectifs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.php | 2 +- unit/abstract_sql/99_sql_types_tables_id.php | 16 ------- unit/boucles/doublons.html | 5 --- unit/connect_sql/id_table_objet.php | 44 -------------------- unit/connect_sql/objet_type.php | 44 -------------------- unit/connect_sql/table_objet.php | 44 -------------------- unit/connect_sql/table_objet_sql.php | 44 -------------------- unit/propre/liens_classes.php | 8 ---- 8 files changed, 1 insertion(+), 206 deletions(-) diff --git a/index.php b/index.php index c09b8082da..1769744981 100644 --- a/index.php +++ b/index.php @@ -104,7 +104,7 @@ $joli = basename($test); $dirTests = false; - $section_svn = ""; + $section_vcs = ""; if ($base == 'tests/') { $dirTests = true; $section = basename(dirname($test)); diff --git a/unit/abstract_sql/99_sql_types_tables_id.php b/unit/abstract_sql/99_sql_types_tables_id.php index 0d8e30d42f..189e976c3c 100644 --- a/unit/abstract_sql/99_sql_types_tables_id.php +++ b/unit/abstract_sql/99_sql_types_tables_id.php @@ -14,7 +14,6 @@ $essais['table_objet'] = array( array('articles','article'), array('auteurs','auteur'), -array('breves','breve'), array('documents','document'), array('documents','doc'), array('documents','img'), @@ -23,11 +22,8 @@ array('forums','forum'), array('groupes_mots','groupe_mots'), array('groupes_mots','groupe_mot'), array('groupes_mots','groupe'), -array('messages','message'), array('mots','mot'), -array('petitions','petition'), array('rubriques','rubrique'), -array('signatures','signature'), array('syndic','syndic'), array('syndic','site'), array('syndic_articles','syndic_article'), @@ -37,7 +33,6 @@ array('types_documents','type_document'), $essais['table_objet_sql'] = array( array('spip_articles','article'), array('spip_auteurs','auteur'), -array('spip_breves','breve'), array('spip_documents','document'), array('spip_documents','doc'), array('spip_documents','img'), @@ -47,11 +42,8 @@ array('spip_groupes_mots','groupes_mots'), array('spip_groupes_mots','groupe_mots'), array('spip_groupes_mots','groupe_mot'), array('spip_groupes_mots','groupe'), -array('spip_messages','message'), array('spip_mots','mot'), -array('spip_petitions','petition'), array('spip_rubriques','rubrique'), -array('spip_signatures','signature'), array('spip_syndic','syndic'), array('spip_syndic','site'), array('spip_syndic_articles','syndic_article'), @@ -61,7 +53,6 @@ array('spip_types_documents','type_document'), $essais['id_table_objet'] = array( array('id_article','article'), array('id_auteur','auteur'), -array('id_breve','breve'), array('id_document','document'), array('id_document','doc'), array('id_document','img'), @@ -71,11 +62,8 @@ array('id_groupe','groupe_mots'), array('id_groupe','groupe_mot'), array('id_groupe','groupes_mots'), array('id_groupe','groupe'), -array('id_message','message'), array('id_mot','mot'), -array('id_petition','petition'), array('id_rubrique','rubrique'), -array('id_signature','signature'), array('id_syndic','syndic'), array('id_syndic','site'), array('id_syndic_article','syndic_article'), @@ -86,16 +74,12 @@ array('extension','type_document'), $essais['objet_type'] = array( array('article','articles'), array('auteur','auteurs'), -array('breve','breves'), array('document','documents'), array('forum','forums'), array('forum','forum'), array('groupe_mots','groupes_mots'), -array('message','messages'), array('mot','mots'), -array('petition','petitions'), array('rubrique','rubriques'), -array('signature','signatures'), array('site','syndic'), array('syndic_article','syndic_articles'), array('types_document','types_documents'), diff --git a/unit/boucles/doublons.html b/unit/boucles/doublons.html index 1771b45f76..87edf41d1d 100644 --- a/unit/boucles/doublons.html +++ b/unit/boucles/doublons.html @@ -2,9 +2,6 @@ <BOUCLE_a(ARTICLES){doublons}></BOUCLE_a> <BOUCLE_b(ARTICLES){doublons}{0,1}>erreur doublons articles</BOUCLE_b> -<BOUCLE_a1(BREVES){doublons}></BOUCLE_a1> -<BOUCLE_b1(BREVES){doublons}{0,1}>erreur doublons breves</BOUCLE_b1> - <BOUCLE_a2(RUBRIQUES){doublons}></BOUCLE_a2> <BOUCLE_b2(RUBRIQUES){doublons}{0,1}>erreur doublons rubriques</BOUCLE_b2> @@ -22,6 +19,4 @@ <//B_b2> -<//B_b1> - <//B_b> diff --git a/unit/connect_sql/id_table_objet.php b/unit/connect_sql/id_table_objet.php index fded0663fd..8169183fbd 100644 --- a/unit/connect_sql/id_table_objet.php +++ b/unit/connect_sql/id_table_objet.php @@ -57,18 +57,6 @@ 0 => 'id_rubrique', 1 => 'id_rubrique', ), - array ( - 0 => 'id_breve', - 1 => 'breves', - ), - array ( - 0 => 'id_breve', - 1 => 'spip_breves', - ), - array ( - 0 => 'id_breve', - 1 => 'id_breve', - ), array ( 0 => 'id_mot', 1 => 'mots', @@ -129,37 +117,8 @@ 0 => 'id_syndic_article', 1 => 'syndic_article', ), - array ( - 0 => 'id_petition', - 1 => 'petitions', - ), - array ( - 0 => 'id_petition', - 1 => 'petition', - ), - array ( - 0 => 'id_petition', - 1 => 'spip_petitions', - ), - array ( - 0 => 'id_signature', - 1 => 'signatures', - ), - array ( - 0 => 'id_signature', - 1 => 'signature', - ), - array ( - 0 => 'id_signature', - 1 => 'spip_signatures', - ), - array ( - 0 => 'id_signature', - 1 => 'id_signature', - ), array('id_article','article'), array('id_auteur','auteur'), -array('id_breve','breve'), array('id_document','document'), array('id_document','doc'), array('id_document','img'), @@ -169,11 +128,8 @@ array('id_groupe','groupe_mots'), array('id_groupe','groupe_mot'), array('id_groupe','groupes_mots'), array('id_groupe','groupe'), -array('id_message','message'), array('id_mot','mot'), -array('id_petition','petition'), array('id_rubrique','rubrique'), -array('id_signature','signature'), array('id_syndic','syndic'), array('id_syndic','site'), array('id_syndic_article','syndic_article'), diff --git a/unit/connect_sql/objet_type.php b/unit/connect_sql/objet_type.php index d2f816abf5..9dd93d623c 100644 --- a/unit/connect_sql/objet_type.php +++ b/unit/connect_sql/objet_type.php @@ -57,18 +57,6 @@ 0 => 'rubrique', 1 => 'id_rubrique', ), - array ( - 0 => 'breve', - 1 => 'breves', - ), - array ( - 0 => 'breve', - 1 => 'spip_breves', - ), - array ( - 0 => 'breve', - 1 => 'id_breve', - ), array ( 0 => 'mot', 1 => 'mots', @@ -129,34 +117,6 @@ 0 => 'syndic_article', 1 => 'syndic_article', ), - array ( - 0 => 'petition', - 1 => 'petitions', - ), - array ( - 0 => 'petition', - 1 => 'petition', - ), - array ( - 0 => 'petition', - 1 => 'spip_petitions', - ), - array ( - 0 => 'signature', - 1 => 'signatures', - ), - array ( - 0 => 'signature', - 1 => 'signature', - ), - array ( - 0 => 'signature', - 1 => 'spip_signatures', - ), - array ( - 0 => 'signature', - 1 => 'id_signature', - ), array ( 0 => 'site', 1 => 'racine-site', @@ -175,16 +135,12 @@ ), array('article','articles'), array('auteur','auteurs'), -array('breve','breves'), array('document','documents'), array('forum','forums'), array('forum','forum'), array('groupe_mots','groupes_mots'), -array('message','messages'), array('mot','mots'), -array('petition','petitions'), array('rubrique','rubriques'), -array('signature','signatures'), array('site','syndic'), array('syndic_article','syndic_articles'), array('types_document','types_documents'), diff --git a/unit/connect_sql/table_objet.php b/unit/connect_sql/table_objet.php index 5b141f35d0..41011c0e3b 100644 --- a/unit/connect_sql/table_objet.php +++ b/unit/connect_sql/table_objet.php @@ -57,18 +57,6 @@ 0 => 'rubriques', 1 => 'id_rubrique', ), - array ( - 0 => 'breves', - 1 => 'breve', - ), - array ( - 0 => 'breves', - 1 => 'spip_breve', - ), - array ( - 0 => 'breves', - 1 => 'id_breve', - ), array ( 0 => 'mots', 1 => 'mot', @@ -129,37 +117,8 @@ 0 => 'syndic_articles', 1 => 'syndic_article', ), - array ( - 0 => 'petitions', - 1 => 'petition', - ), - array ( - 0 => 'petitions', - 1 => 'petitions', - ), - array ( - 0 => 'petitions', - 1 => 'spip_petitions', - ), - array ( - 0 => 'signatures', - 1 => 'signature', - ), - array ( - 0 => 'signatures', - 1 => 'signatures', - ), - array ( - 0 => 'signatures', - 1 => 'spip_signatures', - ), - array ( - 0 => 'signatures', - 1 => 'id_signature', - ), array('articles','article'), array('auteurs','auteur'), -array('breves','breve'), array('documents','document'), array('documents','doc'), array('documents','img'), @@ -168,11 +127,8 @@ array('forums','forum'), array('groupes_mots','groupe_mots'), array('groupes_mots','groupe_mot'), array('groupes_mots','groupe'), -array('messages','message'), array('mots','mot'), -array('petitions','petition'), array('rubriques','rubrique'), -array('signatures','signature'), array('syndic','syndic'), array('syndic','site'), array('syndic_articles','syndic_article'), diff --git a/unit/connect_sql/table_objet_sql.php b/unit/connect_sql/table_objet_sql.php index 4ab09e3cd9..9244fefb22 100644 --- a/unit/connect_sql/table_objet_sql.php +++ b/unit/connect_sql/table_objet_sql.php @@ -57,18 +57,6 @@ 0 => 'spip_rubriques', 1 => 'id_rubrique', ), - array ( - 0 => 'spip_breves', - 1 => 'breve', - ), - array ( - 0 => 'spip_breves', - 1 => 'spip_breve', - ), - array ( - 0 => 'spip_breves', - 1 => 'id_breve', - ), array ( 0 => 'spip_mots', 1 => 'mot', @@ -129,37 +117,8 @@ 0 => 'spip_syndic_articles', 1 => 'syndic_article', ), - array ( - 0 => 'spip_petitions', - 1 => 'petition', - ), - array ( - 0 => 'spip_petitions', - 1 => 'petitions', - ), - array ( - 0 => 'spip_petitions', - 1 => 'spip_petitions', - ), - array ( - 0 => 'spip_signatures', - 1 => 'signature', - ), - array ( - 0 => 'spip_signatures', - 1 => 'signatures', - ), - array ( - 0 => 'spip_signatures', - 1 => 'spip_signatures', - ), - array ( - 0 => 'spip_signatures', - 1 => 'id_signature', - ), array('spip_articles','article'), array('spip_auteurs','auteur'), -array('spip_breves','breve'), array('spip_documents','document'), array('spip_documents','doc'), array('spip_documents','img'), @@ -169,11 +128,8 @@ array('spip_groupes_mots','groupes_mots'), array('spip_groupes_mots','groupe_mots'), array('spip_groupes_mots','groupe_mot'), array('spip_groupes_mots','groupe'), -array('spip_messages','message'), array('spip_mots','mot'), -array('spip_petitions','petition'), array('spip_rubriques','rubrique'), -array('spip_signatures','signature'), array('spip_syndic','syndic'), array('spip_syndic','site'), array('spip_syndic_articles','syndic_article'), diff --git a/unit/propre/liens_classes.php b/unit/propre/liens_classes.php index 8fa7241049..be8f1d5b1f 100644 --- a/unit/propre/liens_classes.php +++ b/unit/propre/liens_classes.php @@ -25,14 +25,6 @@ OR strpos($c,'spip_out')!==FALSE) $err[] = "Classe $c errone dans $p0 : ".PtoBR(propre($p0)); - $id = sql_getfetsel("id_breve","spip_breves","statut='publie'","","","0,1"); - if (!$id) echo "NA Necessite une breve publiee<br />"; - $p0 = "[->breve$id]"; - if (!$c = extraire_attribut(propre($p0), 'class') - OR strpos($c,'spip_in')===FALSE - OR strpos($c,'spip_out')!==FALSE) - $err[] = "Classe $c errone dans $p0 : ".PtoBR(propre($p0)); - $id = sql_getfetsel("id_syndic","spip_syndic","statut='publie'","","","0,1"); if (!$id) echo "NA Necessite un site publie<br />"; $p0 = "[->site$id]"; -- GitLab