Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 1373 → Rev 1374

/trunk/services/tests/0.1/observations/ObservationsTest.php
31,20 → 31,28
$retour = $this->consulterDirectJson($i->consulter([], ['navigation.depart'=>0,'navigation.limite'=>12,'ordre'=>'asc','masque'=>'G']),
$url);
$expected = unserialize(file_get_contents("masque=G.data.json"));
ksort($expected);
ksort($retour);
$this->assertEquals($expected['resultats'], $retour['resultats'], "JSON error, $url");
 
self::ignoreNullValuesAndSort($expected);
self::ignoreNullValuesAndSort($retour);
 
// echo implode(',', array_keys($retour['resultats'])) . "\n" . implode(',', array_keys($expected['resultats']));die;
$this->assertEquals(array_keys($expected['resultats']), array_keys($retour['resultats']), "JSON error, $url");
$this->assertEquals($expected['resultats'], $retour['resultats'], "Différences dans le tableau, $url");
}
 
public function testMasqueEtType() {
$url = $this->creerUrl('observations');
@$url = $this->creerUrl('observations');
$i = new Observations();
$retour = $this->consulterDirectJson($i->consulter([], ['navigation.depart'=>0,'navigation.limite'=>12,'ordre'=>'asc','masque'=>'G','masque.type'=>'endiscussion']),
$url);
$expected = unserialize(file_get_contents("masque=G-masque.type=endiscussion.data.json"));
ksort($expected);
ksort($retour);
$this->assertEquals($expected['resultats'], $retour['resultats'], "JSON error, $url");
 
self::ignoreNullValuesAndSort($expected);
self::ignoreNullValuesAndSort($retour);
 
// echo implode(',', array_keys($retour['resultats'])) . "\n" . implode(',', array_keys($expected['resultats']));die;
$this->assertEquals(array_keys($expected['resultats']), array_keys($retour['resultats']), "JSON error, $url");
$this->assertEquals($expected['resultats'], $retour['resultats'], "Différences dans le tableau, $url");
}
 
 
61,4 → 69,9
$this->assertNotEmpty($arr[$k], "attribut {$k} vide. Voir : $url");
}
}
 
static function ignoreNullValuesAndSort(&$arr) {
$arr['resultats'] = array_map('array_filter', $arr['resultats']);
ksort($arr);
}
}