tests are important !

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-83

diff --git a/htdocs/TESTS/__init__.php b/htdocs/TESTS/__init__.php
index 1c8e965..f8c8ce5 100644 (file)
--- a/htdocs/TESTS/__init__.php
+++ b/htdocs/TESTS/__init__.php
@@ -7,4 +7,6 @@ require_once('unit_tester.php');
 require_once('mock_objects.php');
 require_once('reporter.php');
 
+require_once('xorg.globals.inc.php');
+XorgGlobals::init();
 ?>

diff --git a/htdocs/TESTS/xorg_user.php b/htdocs/TESTS/xorg_user.php
index bdf7631..7d76067 100644 (file)
--- a/htdocs/TESTS/xorg_user.php
+++ b/htdocs/TESTS/xorg_user.php
@@ -1,9 +1,9 @@
 <?php
 require_once("__init__.php");
-require_once("xorg.globals.inc.php");
-XorgGlobals::init();
-
 require_once('include/user.func.inc.php');
+require_once('xorg/page.inc.php');
+
+Mock::generate('XorgPage');
 
 class TestOfXOrgUsers extends UnitTestCase {
     function TestOfXOrgUsers() {
@@ -12,40 +12,46 @@ class TestOfXOrgUsers extends UnitTestCase {
 
     function test_get_user_login() {
         global $page;
+        $page = new MockXorgPage($this, 'index.tpl');
+        $page->expectCallCount('trig',5);
+        
 
         $login = get_user_login(18742);
         $this->assertIdentical($login, 'pierre.habouzit.2000');
-        
         $login = get_user_login(100000000);
         $this->assertIdentical($login, false);
 
 
         $login = get_user_login("madcoder@melix.org");
         $this->assertIdentical($login, 'pierre.habouzit.2000');
-        
         $login = get_user_login("madcoder@melix.net");
         $this->assertIdentical($login, 'pierre.habouzit.2000');
+        $login = get_user_login("devnullr@melix.net");
+        $this->assertIdentical($login, false);
        
 
         $login = get_user_login("madcoder@polytechnique.org");
         $this->assertIdentical($login, 'madcoder');
         $login = get_user_login("madcoder@polytechnique.org", true);
         $this->assertIdentical($login, 'pierre.habouzit.2000');
-        
         $login = get_user_login("madcoder@m4x.org");
         $this->assertIdentical($login, 'madcoder');
+        $login = get_user_login("qwerty@polytechnique.org");
+        $this->assertIdentical($login, false);
         
-        
+
         $login = get_user_login("pierre.habouzit.2000");
         $this->assertIdentical($login, 'pierre.habouzit.2000');
-       
         $login = get_user_login("pierre.habouzit.2001");
         $this->assertIdentical($login, false);
         
         
         $login = get_user_login("madcoder@olympe.madism.org");
         $this->assertIdentical($login, 'pierre.habouzit.2000');
+        $login = get_user_login("qwerty@olympe.madism.org");
+        $this->assertIdentical($login, false);
         
+        $page->tally();
         unset($page);
     }
 }

diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index 0dd4be6..5765753 100644 (file)
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -75,6 +75,7 @@ function get_user_login($data, $get_forlife = false) {
     if (preg_match(',^[0-9]*$,', $data)) {
         $res = $globals->db->query("SELECT alias FROM aliases WHERE type='a_vie' AND id=$data");
         if (!mysql_num_rows($res)) {
+            $page->trig("il n'y a pas d'utilisateur avec cet id");
             $alias = false;
         } else {
             list($alias) = mysql_fetch_row($res);