diff --git a/index.php b/index.php
index 9263b97d6fad66b88abe866991c373e5b361a6cb..5bb7fabeee5a2563db4086810e73d300f3afd8c8 100644
--- a/index.php
+++ b/index.php
@@ -41,29 +41,29 @@
// utiliser le parametre $_GET['fichier'] pour limiter les tests a un seul fichier
if (isset($_GET['fichier']) AND $_GET['fichier'] != '' AND preg_match('[^\d\w-.]', $_GET['fichier']) != 1)
$fic = $_GET['fichier'];
-
-
+
+
foreach ($tests as $test) {
if (isset($fic) AND $fic != '' AND substr_count($test, $fic) == 0)
continue;
if (strlen($t=_request('rech')) && (strpos($test, $t)===false))
continue;
-
- //ignorer le contenu du jeu de squelettes dédié aux tests
- if (stristr($test,'squelettes/'))
- continue;
-
- //ignorer le contenu des donnees de test
- if (stristr($test,'data/'))
- continue;
-
- //ignorer les fichiers lanceurs pour simpleTests aux tests
- if (stristr($test,'lanceur_spip.php'))
- continue;
- if (stristr($test,'all_tests.php'))
- continue;
-
+
+ //ignorer le contenu du jeu de squelettes dédié aux tests
+ if (stristr($test,'squelettes/'))
+ continue;
+
+ //ignorer le contenu des donnees de test
+ if (stristr($test,'data/'))
+ continue;
+
+ //ignorer les fichiers lanceurs pour simpleTests aux tests
+ if (stristr($test,'lanceur_spip.php'))
+ continue;
+ if (stristr($test,'all_tests.php'))
+ continue;
+
if (strncmp(basename($test),'inclus_',7)!==0
AND substr(basename($test),-14) != '_fonctions.php'
AND (strncmp(basename($test),'NA_',3)!==0 OR _request('var_mode')=='dev')){
@@ -98,7 +98,7 @@
}
}
}
-
+
echo "</dl>\n";
echo "<div id='count'>";
@@ -116,7 +116,7 @@ function version_spip() {
$version = $GLOBALS['spip_version_affichee'];
if ($svn_revision = version_svn_courante(_DIR_RACINE))
$version .= ' ' . (($svn_revision < 0) ? 'SVN ':'')
- . "[<a href='http://trac.rezo.net/trac/spip/changeset/"
+ . "[<a href='http://core.spip.org/projects/spip/repository/revisions/"
. abs($svn_revision) . "' onclick=\"window.open(this.href); return false;\">"
. abs($svn_revision) . "</a>]";
diff --git a/simpletest/inc/tests.php b/simpletest/inc/tests.php
index 7d5a56b7f39be33cc53e5577123ac2aa217cf515..85ee3bb9a25fa48e2716a3bf5afd486e441fefa1 100644
--- a/simpletest/inc/tests.php
+++ b/simpletest/inc/tests.php
@@ -1,10 +1,12 @@
<?php
+
include_spip('simpletest/autorun');
include_spip('inc/autoriser');
-if (!autoriser('configurer'))
+if (!autoriser('configurer')) {
die('Administrateur requis !');
+}
if (isset($GLOBALS['visiteur_session']['statut'])
AND $GLOBALS['visiteur_session']['statut'] != '0minirezo'
@@ -467,7 +469,7 @@ class SpipHtmlReporter extends HtmlReporter {
private $_na;
private $character_set;
- function __construct($charset='UTF-8') {
+ public function __construct($charset='UTF-8') {
chdir(_CHDIR);
parent::__construct($charset);
$this->_na = 0;
@@ -477,8 +479,8 @@ class SpipHtmlReporter extends HtmlReporter {
* retourne un code css de deco
*
*/
- function _getCss() {
- $css = parent::_getCss();
+ protected function getCss() {
+ $css = parent::getCss();
return $css . "\n.na{background-color: inherit; color: #fa0;}"
. "\n.complements{background-color: inherit; color: #999;}";
}
@@ -498,7 +500,7 @@ class SpipHtmlReporter extends HtmlReporter {
print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=" .
$this->character_set . "\">\n";
print "<style type=\"text/css\">\n";
- print $this->_getCss() . "\n";
+ print $this->getCss() . "\n";
print "</style>\n";
print "<link rel='stylesheet' href='" . url_absolue(find_in_path('tests.css')) . "' type='text/css' />";
print "</head>\n<body>\n";
@@ -571,7 +573,7 @@ class SpipHtmlReporter extends HtmlReporter {
array_shift($breadcrumb);
print implode(" -> ", $breadcrumb);
$message = $exception->getMessage();
- print " -> <strong>" . $this->_htmlEntities($message) . "</strong><br />\n";
+ print " -> <strong>" . $this->_htmlEntities($message) . "</strong><br />\n";
}
/**
@@ -629,7 +631,7 @@ class SpipHtmlReporter extends HtmlReporter {
$version = $GLOBALS['spip_version_affichee'];
if ($svn_revision = version_svn_courante(_DIR_RACINE)) {
$version .= ' ' . (($svn_revision < 0) ? 'SVN ':'')
- . "[<a href='http://trac.rezo.net/trac/spip/changeset/"
+ . "[<a href='http://core.spip.org/projects/spip/repository/revisions/"
. abs($svn_revision) . "' onclick=\"window.open(this.href); return false;\">"
. abs($svn_revision) . "</a>]";
}
@@ -792,7 +794,7 @@ class SqueletteTest{
<body class="page_test">
' . $this->body . '
</body>
- </html>
+ </html>
';
return $code;
}
diff --git a/simpletest/simpletest/autorun.php b/simpletest/simpletest/autorun.php
index 17ad7a39edc02569ca369b8dd0ce45eb2467d071..5cb1a32aeee384299084db036988a503bb1ef6f6 100644
--- a/simpletest/simpletest/autorun.php
+++ b/simpletest/simpletest/autorun.php
@@ -96,4 +96,4 @@ function capture_new_classes() {
$SIMPLETEST_AUTORUNNER_INITIAL_CLASSES ?
$SIMPLETEST_AUTORUNNER_INITIAL_CLASSES : array()));
}
-?>
\ No newline at end of file
+?>
diff --git a/unit/simpletest/_spipTest/recuperer_code.php b/unit/simpletest/_spipTest/recuperer_code.php
index f9bef200662149de8febdb32b05c180322f1864d..8d79f4af26eea007436954054cd4abc7adc91211 100644
--- a/unit/simpletest/_spipTest/recuperer_code.php
+++ b/unit/simpletest/_spipTest/recuperer_code.php
@@ -2,7 +2,7 @@
require_once('lanceur_spip.php');
class Test_SpipTestRecupererCode extends SpipTest{
-
+
function testRecupererFond(){
$this->assertEqual('Hello World', recuperer_fond('tests/core/inc/inclus_hello_world'));
}
diff --git a/unit/simpletest/_spipTest/spipTest_tests.php b/unit/simpletest/_spipTest/spipTest_tests.php
index c390c2749fe7a3ac4c07acb30b8ed98da1959c3d..7b5eda17dd78baa7eb8f30c23cf65bca43efda87 100644
--- a/unit/simpletest/_spipTest/spipTest_tests.php
+++ b/unit/simpletest/_spipTest/spipTest_tests.php
@@ -1,6 +1,7 @@
<?php
require_once('lanceur_spip.php');
+
class Test_SpipTest extends SpipTest{
function testAssertOk(){