x

xushiwei · xushiwei · commit 12c451ee90aa · 2013-07-03T02:45:56.000+08:00
diff --git a/tests/IoTest.php b/tests/IoTest.php
@@ -15,7 +15,7 @@ public function setUp()
 
 	public function testPutFile()
 	{
-		$key = 'testPutFile' . $tid;
+		$key = 'testPutFile' . getTid();
 		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
 
 		$putPolicy = new Qiniu_RS_PutPolicy($this->bucket);
@@ -37,7 +37,7 @@ public function testPutFile()
 
 	public function testPut()
 	{
-		$key = 'testPut' . $tid;
+		$key = 'testPut' . getTid();
 		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
 
 		$putPolicy = new Qiniu_RS_PutPolicy($this->bucket);
diff --git a/tests/RsTest.php b/tests/RsTest.php
@@ -28,8 +28,8 @@ public function testStat()
 
 	public function testDeleteMoveCopy()
 	{
-		$key2 = 'testOp2' . $tid;
-		$key3 = 'testOp3' . $tid;
+		$key2 = 'testOp2' . getTid();
+		$key3 = 'testOp3' . getTid();
 		Qiniu_RS_Delete($this->client, $this->bucket, $key2);
 		Qiniu_RS_Delete($this->client, $this->bucket, $key3);
 
diff --git a/tests/RsUtilsTest.php b/tests/RsUtilsTest.php
@@ -15,7 +15,7 @@ public function setUp()
 
 	public function testPutFile()
 	{
-		$key = 'testPutFile' . $tid;
+		$key = 'testPutFile' . getTid();
 		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
 
 		$putExtra = new Qiniu_PutExtra();
@@ -35,7 +35,7 @@ public function testPutFile()
 
 	public function testPut()
 	{
-		$key = 'testPut' . $tid;
+		$key = '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);
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -15,3 +15,7 @@
 	$tid = strstr($tid, ".");
 }
 
+function getTid() {
+	return $tid;
+}
+

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function setUp()`
`15`	`15`
`16`	`16`	`public function testPutFile()`
`17`	`17`	`{`
`18`		`- $key = 'testPutFile' . $tid;`
	`18`	`+ $key = 'testPutFile' . getTid();`
`19`	`19`	`$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);`
`20`	`20`
`21`	`21`	`$putPolicy = new Qiniu_RS_PutPolicy($this->bucket);`
`@@ -37,7 +37,7 @@ public function testPutFile()`
`37`	`37`
`38`	`38`	`public function testPut()`
`39`	`39`	`{`
`40`		`- $key = 'testPut' . $tid;`
	`40`	`+ $key = 'testPut' . getTid();`
`41`	`41`	`$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);`
`42`	`42`
`43`	`43`	`$putPolicy = new Qiniu_RS_PutPolicy($this->bucket);`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ public function testStat()`
`28`	`28`
`29`	`29`	`public function testDeleteMoveCopy()`
`30`	`30`	`{`
`31`		`- $key2 = 'testOp2' . $tid;`
`32`		`- $key3 = 'testOp3' . $tid;`
	`31`	`+ $key2 = 'testOp2' . getTid();`
	`32`	`+ $key3 = 'testOp3' . getTid();`
`33`	`33`	`Qiniu_RS_Delete($this->client, $this->bucket, $key2);`
`34`	`34`	`Qiniu_RS_Delete($this->client, $this->bucket, $key3);`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -15,3 +15,7 @@`
`15`	`15`	`$tid = strstr($tid, ".");`
`16`	`16`	`}`
`17`	`17`
	`18`	`+function getTid() {`
	`19`	`+ return $tid;`
	`20`	`+}`
	`21`	`+`