| /trunk/jrest/tests/phptests/localisation-detect.result.php |
|---|
| File deleted |
| /trunk/jrest/tests/phptests/date-pre-1900.result.php |
|---|
| File deleted |
| /trunk/jrest/tests/phptests/transmission.result.php |
|---|
| File deleted |
| /trunk/jrest/tests/phptests/determ-espece.result.php |
|---|
| File deleted |
| /trunk/jrest/tests/phptests/accents.result.php |
|---|
| 5,7 → 5,7 |
| 'nom_ret_nn' => '', |
| 'nt' => '', |
| 'famille' => '', |
| 'nom_referentiel' => '', |
| 'nom_referentiel' => 'autre', |
| 'zone_geo' => '', |
| 'ce_zone_geo' => '', |
| 'date_observation' => '', |
| /trunk/jrest/tests/phptests/determ-espece.test.php |
|---|
| 1,3 → 1,3 |
| <?php |
| // test détermination espèce, simple avec erreur, sans référentiel |
| // test détermination espèce, simple avec erreur |
| return array('Espèce' => 'heliotropium europaeum Xxumm'); |
| /trunk/jrest/tests/phptests/date-post-1900.result.php |
|---|
| 5,7 → 5,7 |
| 'nom_ret_nn' => '', |
| 'nt' => '', |
| 'famille' => '', |
| 'nom_referentiel' => '', |
| 'nom_referentiel' => 'autre', |
| 'zone_geo' => '', |
| 'ce_zone_geo' => '', |
| 'date_observation' => '1991/01/23', |
| /trunk/jrest/tests/phptests/localisation-detect.test.php |
|---|
| 1,3 → 1,3 |
| <?php |
| // test date format texte, pré 1900 |
| return array('Commune' => 'Marseille'); |
| return array('Commune' => 'Marseille'): |
| /trunk/jrest/tests/phptests/01-sample.result.php |
|---|
| 5,7 → 5,7 |
| 'nom_ret_nn' => '', |
| 'nt' => '', |
| 'famille' => '', |
| 'nom_referentiel' => '', |
| 'nom_referentiel' => 'autre', |
| 'zone_geo' => '', |
| 'ce_zone_geo' => '', |
| 'date_observation' => '1991/06/23', |
| /trunk/jrest/tests/phptests/date-format-invert.result.php |
|---|
| 5,7 → 5,7 |
| 'nom_ret_nn' => '', |
| 'nt' => '', |
| 'famille' => '', |
| 'nom_referentiel' => '', |
| 'nom_referentiel' => 'autre', |
| 'zone_geo' => '', |
| 'ce_zone_geo' => '', |
| 'date_observation' => '1991/01/23', |
| /trunk/jrest/tests/phptests/date-format-revert.result.php |
|---|
| 5,7 → 5,7 |
| 'nom_ret_nn' => '', |
| 'nt' => '', |
| 'famille' => '', |
| 'nom_referentiel' => '', |
| 'nom_referentiel' => 'autre', |
| 'zone_geo' => '', |
| 'ce_zone_geo' => '', |
| 'date_observation' => '1991/01/23', |
| /trunk/jrest/tests/IO-fields-unittest.php |
|---|
| 30,18 → 30,15 |
| if(!$tests) $tests = $all_tests; |
| foreach($tests as $test) { |
| setupTestEnv(); @array_walk(glob('run/*'), function(&$i) { unlink($i);}); |
| setupTestEnv(); |
| // cache car l'upload de fichier PHP-curl ne peut être |
| // simulé avec le contenu d'une variable (cf CURLOPT_POSTFIELDS et @fichier) |
| $runfile = 'run/' . basename($test); |
| if(!is_file($runfile)) { |
| $test_array = require($test); |
| $csv = genCSV($test_array); |
| $csv = genCSV(require($test)); |
| file_put_contents($runfile, $csv); |
| } |
| echo "\tcurl -F \"upload=@$runfile\" -F utilisateur=" . USER . " \"" . DOMAIN . "/jrest/ImportXLS\"\n"; |
| echo "$test: "; |
| $var_expected = include(str_replace('.test.', '.result.', $test)); |
| $retour = import($runfile); |
| 49,30 → 46,22 |
| preg_match('/^ligne /', $retour, $count_warn); |
| $count_warn = count($count_warn); |
| echo $count_warn . "\n"; |
| $result = getCSV_line(export(), 1); |
| unset($result['date_creation'], $result['date_modification'], $result['id_observation']); |
| //var_dump(champsLongToShort2($test_array));die; |
| echo "$test\n"; |
| if($var_expected) { |
| $d1 = array_diff($var_expected, $result); |
| $d2 = array_diff($result, $var_expected); |
| if(!$d1 && !$d2) echo "OK\n"; |
| if(! array_diff($var_expected, $result) && ! array_diff($result, $var_expected)) echo "OK\n"; |
| else { |
| echo "FAIL\n"; |
| if($d1) print_r($d1); |
| if($d2) print_r($d2); |
| //var_dump($var_expected, $result); |
| var_dump(array_diff($var_expected, $result), array_diff($result, $var_expected)); |
| } |
| echo $retour; |
| if($count_warn) { echo "warnings: $count_warn\n"; } |
| } |
| else { |
| echo $retour; |
| if($count_warn) { echo "warnings: $count_warn\n"; } |
| echo '<?php return ' . var_export($result, true) . ';'; |
| echo '<?php return ' . var_export($result, true) . ';' |
| } |
| } |
| // sed -i -e '1{/<?php return/!s:^:<?php return :}' -e '${/^)$/s:$:;:}' phptests/*.result.php |
| /trunk/jrest/tests/api.php |
|---|
| 236,12 → 236,3 |
| return $r; |
| } |
| function champsLongToShort2($a) { |
| $r = array(); |
| $x = array_flip($GLOBALS['champs']); |
| foreach($a as $k => $v) { |
| if(isset($x[$k])) $r[$x[$k]] = $v; |
| else $r[$k] = $v; |
| } |
| return $r; |
| } |
| /trunk/jrest/tests |
|---|
| Property changes: |
| Deleted: svn:ignore |
| -run |