Merge branch 'testing'

2 files changed, 90 insertions, 5 deletions

diff --git a/tests/CurryTest.php b/tests/CurryTest.php
new file mode 100644
index 000000000..37b66cc74
--- /dev/null
+++ b/tests/CurryTest.php
@@ -0,0 +1,72 @@
+<?php
+
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+    print "This script must be run from the command line\n";
+    exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('STATUSNET', true);
+define('LACONICA', true);
+
+require_once INSTALLDIR . '/lib/common.php';
+
+class CurryTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provider
+     *
+     */
+    public function testProduction($callback, $curry_params, $call_params, $expected)
+    {
+        $params = array_merge(array($callback), $curry_params);
+        $curried = call_user_func_array('curry', $params);
+        $result = call_user_func_array($curried, $call_params);
+        $this->assertEquals($expected, $result);
+    }
+
+    static public function provider()
+    {
+        $obj = new CurryTestHelperObj('oldval');
+        return array(array(array('CurryTest', 'callback'),
+                           array('curried'),
+                           array('called'),
+                           'called|curried'),
+                     array(array('CurryTest', 'callback'),
+                           array('curried1', 'curried2'),
+                           array('called1', 'called2'),
+                           'called1|called2|curried1|curried2'),
+                     array(array('CurryTest', 'callbackObj'),
+                           array($obj),
+                           array('newval1'),
+                           'oldval|newval1'),
+                     // Confirm object identity is retained...
+                     array(array('CurryTest', 'callbackObj'),
+                           array($obj),
+                           array('newval2'),
+                           'newval1|newval2'));
+    }
+
+    static function callback()
+    {
+        $args = func_get_args();
+        return implode("|", $args);
+    }
+
+    static function callbackObj($val, $obj)
+    {
+        $old = $obj->val;
+        $obj->val = $val;
+        return "$old|$val";
+    }
+}
+
+class CurryTestHelperObj
+{
+    public $val='';
+
+    function __construct($val)
+    {
+        $this->val = $val;
+    }
+}
diff --git a/tests/UserRightsTest.php b/tests/UserRightsTest.php
index 6544ee53d..d24a172f6 100644
--- a/tests/UserRightsTest.php
+++ b/tests/UserRightsTest.php
@@ -16,14 +16,26 @@ class UserRightsTest extends PHPUnit_Framework_TestCase
 
     function setUp()
     {
+        $user = User::staticGet('nickname', 'userrightstestuser');
+        if ($user) {
+            // Leftover from a broken test run?
+            $profile = $user->getProfile();
+            $user->delete();
+            $profile->delete();
+        }
         $this->user = User::register(array('nickname' => 'userrightstestuser'));
+        if (!$this->user) {
+            throw new Exception("Couldn't register userrightstestuser");
+        }
     }
 
     function tearDown()
     {
-        $profile = $this->user->getProfile();
-        $this->user->delete();
-        $profile->delete();
+        if ($this->user) {
+            $profile = $this->user->getProfile();
+            $this->user->delete();
+            $profile->delete();
+        }
     }
 
     function testInvalidRole()
@@ -33,7 +45,8 @@ class UserRightsTest extends PHPUnit_Framework_TestCase
 
     function standardRoles()
     {
-        return array('admin', 'moderator');
+        return array(array('admin'),
+                     array('moderator'));
     }
 
     /**
@@ -54,6 +67,6 @@ class UserRightsTest extends PHPUnit_Framework_TestCase
     function testGrantedRole($role)
     {
         $this->user->grantRole($role);
-        $this->assertFalse($this->user->hasRole($role));
+        $this->assertTrue($this->user->hasRole($role));
     }
 }
\ No newline at end of file