dev #72845 fix builds failures / errors

tests/application/modules/admin/controllers/UserGroupControllerTest.php

@@ -1071,7 +1071,6 @@ class Admin_UserGroupControllerRessourcesNumeriquesTest extends Admin_UserGroupC
     return [['ArteVod', 'ARTE'],
             ['Vodeclic', 'Vodéclic'],
             ['Numilog', 'Numilog'],
-            ['CVS', 'CVS'],
             ['ToutApprendre', 'Tout Apprendre'],
             ['Musicme', 'musicMe'],
             ['NumeriquePremium', 'Numérique Premium']];

tests/application/modules/opac/controllers/ModulesControllerTest.php

@@ -28,7 +28,6 @@ class ModulesControllerLoginRequiredTest extends AbstractControllerTestCase {
 
   public function datas() {
     return [
-            ['CVS', 'cvs'],
             ['Vodeclic', 'vodeclic'],
             ['ToutApprendre', 'toutapprendre']
     ];

tests/library/Class/MoteurRechercheTest.php

@@ -309,13 +309,13 @@ class MoteurRechercheSimpleTest extends MoteurRechercheTestCase {
             [['expressionRecherche' => '',
               'digital_lib' => '1'],
              'nb_mots'=> 0,
-             'req_liste' => "select id_notice, facettes from notices Where (type_doc in ('100','101','102','103','104','105','106','107','108','109','110','111','112','114','113','115','116','117','119','Assimil','LaSourisQuiRaconte','Lekiosk','Musicme','Omeka','Skilleos','StoryPlayR'))"],
+             'req_liste' => "select id_notice, facettes from notices Where (type_doc in ('100','101','102','103','104','105','106','108','109','110','111','112','114','113','115','116','117','119','Assimil','Cvs','LaSourisQuiRaconte','Lekiosk','Musicme','Omeka','Skilleos','StoryPlayR'))"],
 
 
             [['expressionRecherche' => 'logo',
               'digital_lib' => '1'],
              'nb_mots'=> 1,
-             'req_liste' => "select id_notice, facettes from notices Where " . $match_axes . " AGAINST('+(LOGO LOGOS LOGO)' IN BOOLEAN MODE) and (type_doc in ('100','101','102','103','104','105','106','107','108','109','110','111','112','114','113','115','116','117','119','Assimil','LaSourisQuiRaconte','Lekiosk','Musicme','Omeka','Skilleos','StoryPlayR')) order by (MATCH(alpha_titre) AGAINST(' LOGO') * 1.5) + (MATCH(alpha_auteur) AGAINST(' LOGO')) desc"],
+             'req_liste' => "select id_notice, facettes from notices Where " . $match_axes . " AGAINST('+(LOGO LOGOS LOGO)' IN BOOLEAN MODE) and (type_doc in ('100','101','102','103','104','105','106','108','109','110','111','112','114','113','115','116','117','119','Assimil','Cvs','LaSourisQuiRaconte','Lekiosk','Musicme','Omeka','Skilleos','StoryPlayR')) order by (MATCH(alpha_titre) AGAINST(' LOGO') * 1.5) + (MATCH(alpha_auteur) AGAINST(' LOGO')) desc"],
 
             [['expressionRecherche' => '',
               'id_panier' => 4],

tests/library/ZendAfi/View/Helper/TagCVSCriteresRechercheTest.php

-<?php
-/**
- * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.
- *
- * BOKEH is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation.
- *
- * There are special exceptions to the terms and conditions of the AGPL as it
- * is applied to this software (see README file).
- *
- * BOKEH is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
- * along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA 
- */
-
-class ZendAfi_View_Helper_TagCVSCriteresRechercheTest extends ViewHelperTestCase {
-  protected $_html;
-
-  public function setUp() {
-    parent::setUp();
-    $this->_helper = new ZendAfi_View_Helper_TagCVSCriteresRecherche();
-    $this->_helper->setView(new ZendAfi_Controller_Action_Helper_View());
-    $this->criteres_recherche=new Class_CriteresRecherche();
-
-  }
-
-  public function setCriteresRecherche($params) {
-    $this->criteres_recherche->setParams($params);
-    $this->_html = $this->_helper->tagCVSCriteresRecherche($this->criteres_recherche);
-  }
-
-  /** @test */
-  public function critereRechercheSimpleShouldReturn() {
-    $params['expressionRecherche']='pomme';
-    $this->setCriteresRecherche($params);
-    $this->assertEquals('pomme',$this->_html);
-  }
-
-
-  /** @test */
-  public function critereRechercheSimpleWithFocetteShouldReturn() {
-    $params['expressionRecherche']='pomme';
-    $params['facettes']='T10';
-    $this->mock_codif = Storm_Test_ObjectWrapper::mock();
-    $this->mock_codif
-      ->whenCalled('getLibelleFacette')
-      ->answers('facette');
-
-    Class_Codification::setInstance($this->mock_codif);
-    $this->setCriteresRecherche($params);
-    $this->assertEquals('pomme+facette',$this->_html);
-  }
-
-
-  /** @test */
-  public function critereRechercheAvanceeShouldBePresent() {
-    $params['rech_titres']='Jules et Jim';
-
-    $this->setCriteresRecherche($params);
-    $this->assertEquals('Jules et Jim',$this->_html);
-  }
-
-}
-
-?>
\ No newline at end of file