eFlore/Projets.eflore-projetsApplications.annuaireApplications.bazarApplications.dictionnaireApplications.frameworkApplications.galerieApplications.gttApplications.papyrusApplications.projetApplications.referentielApplications.reseauApplications.wikinieFlore/Applications.bibliobotaeFlore/Applications.celeFlore/Applications.cel-consultationeFlore/Applications.coeleFlore/Applications.coel-consultationeFlore/Applications.deleFlore/Applications.eflore-consultationeFlore/Applications.moissonnageeFlore/Archives.cel-v1eFlore/Archives.cel-v2eFlore/Archives.chorologieeFlore/Archives.eflore-consultation-v1eFlore/Archives.eflore-consultation-v2eFlore/Archives.eflore-xuleFlore/Archives.herbierseFlore/Projets.communesSites.gentiana.orgSites.obs-saisons.frSites.outils-naturalistes.frSites.tela-botanica.org

BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /trunk/services/tests/0.1/cel/CelImagesTest.php @ 260

  → /trunk/services/tests/0.1/cel/CelImagesTest.php @ 261

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 260 → Rev 261

/trunk/services/tests/0.1/cel/CelImagesTest.php
90,13 → 90,13
$this->assertEquals('nn=182', $retour['entete']['masque'], 'Valeur entete > masque = "nn=182"');
$this->assertSame(0, $retour['entete']['depart'], 'Valeur entete > depart = 0');
$this->assertSame(100, $retour['entete']['limite'], 'Valeur entete > limite = 0');
$this->assertSame(97, $retour['entete']['total'], 'Valeur entete > total = 97');
$this->assertSame(62, $retour['entete']['total'], 'Valeur entete > total = 62');
$this->assertArrayNotHasKey('href.suivant', $retour['entete'], "Absence champ : entete > href.suivant");
$this->assertArrayNotHasKey('href.precedent', $retour['entete'], "Absence champ : entete > href.precedent");
$this->verifierResultatsChampsObligatoires($retour);
$this->verifierResultatsValeursGenerique($retour);
$this->assertCount(97, $retour['resultats'], 'Nbre resultats = 97');
$this->assertCount(62, $retour['resultats'], 'Nbre resultats = 62');
foreach ($retour['resultats'] as $id => $resultat) {
$this->assertRegExp("/CRX2S/", $resultat['binaire.href']);
}
104,41 → 104,41
public function testListeImagesJsonMasqueNnMultiple() {
$ressources = array();
$parametres = array('masque.nn' => '62018,182','retour' => 'application/json');
$parametres = array('masque.nn' => '62018,182,141','retour' => 'application/json');
$retour = $this->consulterJson($ressources, $parametres);
$this->verifierEnteteChampsObligatoires($retour);
$this->assertEquals('nn=62018,182', $retour['entete']['masque'], 'Valeur entete > masque = "nn=62018,182"');
$this->assertEquals('nn=62018,182,141', $retour['entete']['masque'], 'Valeur entete > masque = "nn=62018,182,141"');
$this->assertSame(0, $retour['entete']['depart'], 'Valeur entete > depart = 0');
$this->assertSame(100, $retour['entete']['limite'], 'Valeur entete > limite = 0');
$this->assertSame(112, $retour['entete']['total'], 'Valeur entete > total = 112');
$this->assertSame(134, $retour['entete']['total'], 'Valeur entete > total = 134');
$this->assertArrayHasKey('href.suivant', $retour['entete'], "Présence champ : entete > href.suivant");
$urlHrefSuivantAttendue = 'http://localhost/service:eflore:0.1/cel/images?navigation.depart=100&navigation.limite=100&masque.nn=62018,182';
$urlHrefSuivantAttendue = 'http://localhost/service:eflore:0.1/cel/images?navigation.depart=100&navigation.limite=100&masque.nn=62018,182,141';
$this->assertEquals($urlHrefSuivantAttendue, $retour['entete']['href.suivant'], "Valeur entete > href.suivant = '$urlHrefSuivantAttendue'");
$this->assertArrayNotHasKey('href.precedent', $retour['entete'], "Abscence champ : entete > href.precedent");
$this->verifierResultatsChampsObligatoires($retour);
$this->verifierResultatsValeursGenerique($retour);
$this->assertCount(100, $retour['resultats'], 'Nbre resultats = 100');
$this->assertCount(100, $retour['resultats'], 'Nbre resultats = 134');
$this->assertArrayHasKey('6114', $retour['resultats'], "Présence champ : resultats > 6114");
}
public function testListeImagesJsonNavigation() {
$ressources = array();
$parametres = array('masque.nn' => '62018,182', 'retour' => 'application/json',
$parametres = array('masque.nn' => '62018,182,141', 'retour' => 'application/json',
'navigation.depart' => 100, 'navigation.limite' => 100);
$retour = $this->consulterJson($ressources, $parametres);
$this->verifierEnteteChampsObligatoires($retour);
$this->assertEquals('nn=62018,182', $retour['entete']['masque'], 'Valeur entete > masque = "nn=62018,182"');
$this->assertEquals('nn=62018,182,141', $retour['entete']['masque'], 'Valeur entete > masque = "nn=62018,182,141"');
$this->assertSame((int)$parametres['navigation.depart'], $retour['entete']['depart'], "Valeur entete > depart = {$parametres['navigation.depart']}");
$this->assertSame((int)$parametres['navigation.limite'], $retour['entete']['limite'], "Valeur entete > limite = {$parametres['navigation.limite']}");
$this->assertSame(112, $retour['entete']['total'], 'Valeur entete > total = 112');
$this->assertSame(134, $retour['entete']['total'], 'Valeur entete > total = 134');
$this->assertArrayHasKey('href.precedent', $retour['entete'], "Présence champ : entete > href.precedent");
$urlHrefPrecedentAttendue = 'http://localhost/service:eflore:0.1/cel/images?navigation.depart=0&navigation.limite=100&masque.nn=62018,182';
$urlHrefPrecedentAttendue = 'http://localhost/service:eflore:0.1/cel/images?navigation.depart=0&navigation.limite=100&masque.nn=62018,182,141';
$this->assertEquals($urlHrefPrecedentAttendue, $retour['entete']['href.precedent'], "Valeur entete > href.precedent = '$urlHrefPrecedentAttendue'");
$this->assertArrayNotHasKey('href.suivant', $retour['entete'], "Abscence champ : entete > href.suivant");