rio testcase

Author: xushiwei

qiniu/io.php

@@ -14,7 +14,7 @@ class Qiniu_PutExtra
 	public $CheckCrc = 0;
 }
 
-function Qiniu_Put($upToken, $key, $body, $fsize, $putExtra) // => ($putRet, $err)
+function Qiniu_Put($upToken, $key, $body, $putExtra) // => ($putRet, $err)
 {
 	global $QINIU_UP_HOST;
 

qiniu/resumable_io.php

@@ -134,9 +134,9 @@ function Qiniu_Rio_PutFile($upToken, $key, $localFile, $putExtra) // => ($putRet
 	}
 
 	$fi = fstat($fp);
-
-	Qiniu_Rio_Put($upToken, $key, $fp, $fi['size'], $putExtra);
+	$result = Qiniu_Rio_Put($upToken, $key, $fp, $fi['size'], $putExtra);
 	fclose($fp);
+	return $result;
 }
 
 // ----------------------------------------------------------

qiniu/rs_utils.php

@@ -18,3 +18,27 @@ function Qiniu_RS_PutFile($self, $bucket, $key, $localFile, $putExtra) // => ($p
 	return Qiniu_PutFile($upToken, $key, $localFile, $putExtra);
 }
 
+function Qiniu_RS_Rput($self, $bucket, $key, $body, $fsize, $putExtra) // => ($putRet, $err)
+{
+	$putPolicy = new Qiniu_RS_PutPolicy("$bucket:$key");
+	$upToken = $putPolicy->Token($self->Mac);
+	if ($putExtra == null) {
+		$putExtra = new Qiniu_Rio_PutExtra($bucket);
+	} else {
+		$putExtra->Bucket = $bucket;
+	}
+	return Qiniu_Rio_Put($upToken, $key, $body, $fsize, $putExtra);
+}
+
+function Qiniu_RS_RputFile($self, $bucket, $key, $localFile, $putExtra) // => ($putRet, $err)
+{
+	$putPolicy = new Qiniu_RS_PutPolicy("$bucket:$key");
+	$upToken = $putPolicy->Token($self->Mac);
+	if ($putExtra == null) {
+		$putExtra = new Qiniu_Rio_PutExtra($bucket);
+	} else {
+		$putExtra->Bucket = $bucket;
+	}
+	return Qiniu_Rio_PutFile($upToken, $key, $localFile, $putExtra);
+}
+

tests/RioTest.php

@@ -2,28 +2,6 @@
 
 require_once("bootstrap.php");
 
-class MockReader
-{
-	private $off = 0;
-
-	public function __construct($off = 0)
-	{
-		$this->off = $off;
-	}
-
-	public function Read($bytes) // => ($data, $err)
-	{
-		$off = $this->off;
-		$data = '';
-		for ($i = 0; $i < $bytes; $i++) {
-			$data .= chr(65 + ($off % 26)); // ord('A') = 65
-			$off++;
-		}
-		$this->off = $off;
-		return array($data, null);
-	}
-}
-
 class RioTest extends PHPUnit_Framework_TestCase
 {
 	public $bucket;

tests/RsUtilsTest.php

@@ -14,6 +14,43 @@ public function setUp()
 		$this->bucket = getenv("QINIU_BUCKET_NAME");
 	}
 
+	public function testRput()
+	{
+		$key = 'tmp/testRput' . getTid();
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
+
+		$reader = new MockReader;
+		list($ret, $err) = Qiniu_RS_Rput($this->client, $this->bucket, $key, $reader, 5, null);
+		$this->assertNull($err);
+		var_dump($ret);
+		$this->assertEquals($ret['hash'], "Fnvgeq9GDVk6Mj0Nsz2gW2S_3LOl");
+
+		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $key);
+		$this->assertNull($err);
+		var_dump($ret);
+
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
+		$this->assertNull($err);
+	}
+
+	public function testRputFile()
+	{
+		$key = 'tmp/testRputFile' . getTid();
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
+
+		list($ret, $err) = Qiniu_RS_RputFile($this->client, $this->bucket, $key, __file__, null);
+		$this->assertNull($err);
+		var_dump($ret);
+		$this->assertArrayHasKey('hash', $ret);
+
+		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $key);
+		$this->assertNull($err);
+		var_dump($ret);
+
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
+		$this->assertNull($err);
+	}
+
 	public function testPutFile()
 	{
 		$key = 'tmp/testPutFile' . getTid();
@@ -39,7 +76,7 @@ public function testPut()
 		$key = 'tmp/testPut' . getTid();
 		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
 
-		list($ret, $err) = Qiniu_RS_Put($this->client, $this->bucket, $key, "hello world!", null);
+		list($ret, $err) = Qiniu_RS_Put($this->client, $this->bucket, $key, 'hello world!', null);
 		$this->assertNull($err);
 		$this->assertArrayHasKey('hash', $ret);
 		var_dump($ret);

tests/bootstrap.php

@@ -24,3 +24,25 @@ function getTid() {
 	return $tid;
 }
 
+class MockReader
+{
+	private $off = 0;
+
+	public function __construct($off = 0)
+	{
+		$this->off = $off;
+	}
+
+	public function Read($bytes) // => ($data, $err)
+	{
+		$off = $this->off;
+		$data = '';
+		for ($i = 0; $i < $bytes; $i++) {
+			$data .= chr(65 + ($off % 26)); // ord('A') = 65
+			$off++;
+		}
+		$this->off = $off;
+		return array($data, null);
+	}
+}
+