Skip to content

Commit 5c64a4e

Browse files
lihsai0lihsai0
committed
improve test cases to allow run ci concurrently
1 parent f15dca5 commit 5c64a4e

File tree

5 files changed

+473
-411
lines changed

5 files changed

+473
-411
lines changed

‎.github/workflows/test-ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: PHP CI with Composer
22

33
on: [push, pull_request]
44

5-
concurrency: keep-only-one
6-
75
jobs:
86
build:
97
strategy:

‎tests/Qiniu/Tests/AuthTest.php

Lines changed: 130 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -71,139 +71,136 @@ public function testSignQiniuAuthorization()
7171
{
7272
$auth = new Auth("ak", "sk");
7373

74-
// ---
75-
$url = "";
76-
$method = "";
77-
$headers = new Header(array(
78-
"X-Qiniu-" => array("a"),
79-
"X-Qiniu" => array("b"),
80-
"Content-Type" => array("application/x-www-form-urlencoded"),
81-
));
82-
$body = "{\"name\": \"test\"}";
83-
list($sign, $err) = $auth->signQiniuAuthorization($url, $method, $body, $headers);
84-
$this->assertNull($err);
85-
$this->assertEquals("ak:0i1vKClRDWFyNkcTFzwcE7PzX74=", $sign);
86-
87-
// ---
88-
$url = "";
89-
$method = "";
90-
$headers = new Header(array(
91-
"Content-Type" => array("application/json"),
92-
));
93-
list($sign, $err) = $auth->signQiniuAuthorization($url, $method, $body, $headers);
94-
$this->assertNull($err);
95-
$this->assertEquals("ak:K1DI0goT05yhGizDFE5FiPJxAj4=", $sign);
96-
97-
// ---
98-
$url = "";
99-
$method = "GET";
100-
$headers = new Header(array(
101-
"X-Qiniu-" => array("a"),
102-
"X-Qiniu" => array("b"),
103-
"Content-Type" => array("application/x-www-form-urlencoded"),
104-
));
105-
$body = "{\"name\": \"test\"}";
106-
list($sign, $err) = $auth->signQiniuAuthorization($url, $method, $body, $headers);
107-
$this->assertNull($err);
108-
$this->assertEquals("ak:0i1vKClRDWFyNkcTFzwcE7PzX74=", $sign);
109-
110-
// ---
111-
$url = "";
112-
$method = "POST";
113-
$headers = new Header(array(
114-
"Content-Type" => array("application/json"),
115-
"X-Qiniu" => array("b"),
116-
));
117-
$body = "{\"name\": \"test\"}";
118-
list($sign, $err) = $auth->signQiniuAuthorization($url, $method, $body, $headers);
119-
$this->assertNull($err);
120-
$this->assertEquals("ak:0ujEjW_vLRZxebsveBgqa3JyQ-w=", $sign);
121-
122-
// ---
123-
$url = "http://upload.qiniup.com";
124-
$method = "";
125-
$headers = new Header(array(
126-
"X-Qiniu-" => array("a"),
127-
"X-Qiniu" => array("b"),
128-
"Content-Type" => array("application/x-www-form-urlencoded"),
129-
));
130-
$body = "{\"name\": \"test\"}";
131-
list($sign, $err) = $auth->signQiniuAuthorization($url, $method, $body, $headers);
132-
$this->assertNull($err);
133-
$this->assertEquals("ak:GShw5NitGmd5TLoo38nDkGUofRw=", $sign);
134-
135-
// ---
136-
$url = "http://upload.qiniup.com";
137-
$method = "";
138-
$headers = new Header(array(
139-
"Content-Type" => array("application/json"),
140-
"X-Qiniu-Bbb" => array("BBB", "AAA"),
141-
"X-Qiniu-Aaa" => array("DDD", "CCC"),
142-
"X-Qiniu-" => array("a"),
143-
"X-Qiniu" => array("b"),
144-
));
145-
$body = "{\"name\": \"test\"}";
146-
list($sign, $err) = $auth->signQiniuAuthorization($url, $method, $body, $headers);
147-
$this->assertNull($err);
148-
$this->assertEquals("ak:DhNA1UCaBqSHCsQjMOLRfVn63GQ=", $sign);
149-
150-
// ---
151-
$url = "http://upload.qiniup.com";
152-
$method = "";
153-
$headers = new Header(array(
154-
"Content-Type" => array("application/x-www-form-urlencoded"),
155-
"X-Qiniu-Bbb" => array("BBB", "AAA"),
156-
"X-Qiniu-Aaa" => array("DDD", "CCC"),
157-
"X-Qiniu-" => array("a"),
158-
"X-Qiniu" => array("b"),
159-
));
160-
$body = "name=test&language=go";
161-
list($sign, $err) = $auth->signQiniuAuthorization($url, $method, $body, $headers);
162-
$this->assertNull($err);
163-
$this->assertEquals("ak:KUAhrYh32P9bv0COD8ugZjDCmII=", $sign);
164-
165-
// ---
166-
$url = "http://upload.qiniup.com";
167-
$method = "";
168-
$headers = new Header(array(
169-
"Content-Type" => array("application/x-www"),
170-
"Content-Type" => array("application/x-www-form-urlencoded"),
171-
"X-Qiniu-Bbb" => array("BBB", "AAA"),
172-
"X-Qiniu-Aaa" => array("DDD", "CCC"),
173-
));
174-
$body = "name=test&language=go";
175-
list($sign, $err) = $auth->signQiniuAuthorization($url, $method, $body, $headers);
176-
$this->assertNull($err);
177-
$this->assertEquals("ak:KUAhrYh32P9bv0COD8ugZjDCmII=", $sign);
178-
179-
// ---
180-
$url = "http://upload.qiniup.com/mkfile/sdf.jpg";
181-
$method = "";
182-
$headers = new Header(array(
183-
"Content-Type" => array("application/x-www-form-urlencoded"),
184-
"X-Qiniu-Bbb" => array("BBB", "AAA"),
185-
"X-Qiniu-Aaa" => array("DDD", "CCC"),
186-
"X-Qiniu-" => array("a"),
187-
"X-Qiniu" => array("b"),
188-
));
189-
$body = "name=test&language=go";
190-
list($sign, $err) = $auth->signQiniuAuthorization($url, $method, $body, $headers);
191-
$this->assertNull($err);
192-
$this->assertEquals("ak:fkRck5_LeyfwdkyyLk-hyNwGKac=", $sign);
193-
194-
$url = "http://upload.qiniup.com/mkfile/sdf.jpg?s=er3&df";
195-
$method = "";
196-
$headers = new Header(array(
197-
"Content-Type" => array("application/x-www-form-urlencoded"),
198-
"X-Qiniu-Bbb" => array("BBB", "AAA"),
199-
"X-Qiniu-Aaa" => array("DDD", "CCC"),
200-
"X-Qiniu-" => array("a"),
201-
"X-Qiniu" => array("b"),
202-
));
203-
$body = "name=test&language=go";
204-
list($sign, $err) = $auth->signQiniuAuthorization($url, $method, $body, $headers);
205-
$this->assertNull($err);
206-
$this->assertEquals("ak:PUFPWsEUIpk_dzUvvxTTmwhp3p4=", $sign);
74+
$testCases = array(
75+
array(
76+
"url" => "",
77+
"method" => "",
78+
"headers" => array(
79+
"X-Qiniu-" => array("a"),
80+
"X-Qiniu" => array("b"),
81+
"Content-Type" => array("application/x-www-form-urlencoded")
82+
),
83+
"body" => "{\"name\": \"test\"}",
84+
"expectedToken" => "ak:0i1vKClRDWFyNkcTFzwcE7PzX74="
85+
),
86+
array(
87+
"url" => "",
88+
"method" => "",
89+
"headers" => array(
90+
"Content-Type" => array("application/json")
91+
),
92+
"body" => "{\"name\": \"test\"}",
93+
"expectedToken" => "ak:K1DI0goT05yhGizDFE5FiPJxAj4="
94+
),
95+
array(
96+
"url" => "",
97+
"method" => "GET",
98+
"headers" => array(
99+
"X-Qiniu-" => array("a"),
100+
"X-Qiniu" => array("b"),
101+
"Content-Type" => array("application/x-www-form-urlencoded"),
102+
),
103+
"body" => "{\"name\": \"test\"}",
104+
"expectedToken" => "ak:0i1vKClRDWFyNkcTFzwcE7PzX74="
105+
),
106+
array(
107+
"url" => "",
108+
"method" => "POST",
109+
"headers" => array(
110+
"Content-Type" => array("application/json"),
111+
"X-Qiniu" => array("b"),
112+
),
113+
"body" => "{\"name\": \"test\"}",
114+
"expectedToken" => "ak:0ujEjW_vLRZxebsveBgqa3JyQ-w="
115+
),
116+
array(
117+
"url" => "http://upload.qiniup.com",
118+
"method" => "",
119+
"headers" => array(
120+
"X-Qiniu-" => array("a"),
121+
"X-Qiniu" => array("b"),
122+
"Content-Type" => array("application/x-www-form-urlencoded"),
123+
),
124+
"body" => "{\"name\": \"test\"}",
125+
"expectedToken" => "ak:GShw5NitGmd5TLoo38nDkGUofRw="
126+
),
127+
array(
128+
"url" => "http://upload.qiniup.com",
129+
"method" => "",
130+
"headers" => array(
131+
"Content-Type" => array("application/json"),
132+
"X-Qiniu-Bbb" => array("BBB", "AAA"),
133+
"X-Qiniu-Aaa" => array("DDD", "CCC"),
134+
"X-Qiniu-" => array("a"),
135+
"X-Qiniu" => array("b"),
136+
),
137+
"body" => "{\"name\": \"test\"}",
138+
"expectedToken" => "ak:DhNA1UCaBqSHCsQjMOLRfVn63GQ="
139+
),
140+
array(
141+
"url" => "http://upload.qiniup.com",
142+
"method" => "",
143+
"headers" => array(
144+
"Content-Type" => array("application/x-www-form-urlencoded"),
145+
"X-Qiniu-Bbb" => array("BBB", "AAA"),
146+
"X-Qiniu-Aaa" => array("DDD", "CCC"),
147+
"X-Qiniu-" => array("a"),
148+
"X-Qiniu" => array("b"),
149+
),
150+
"body" => "name=test&language=go",
151+
"expectedToken" => "ak:KUAhrYh32P9bv0COD8ugZjDCmII="
152+
),
153+
array(
154+
"url" => "http://upload.qiniup.com",
155+
"method" => "",
156+
"headers" => array(
157+
"Content-Type" => array("application/x-www"),
158+
"Content-Type" => array("application/x-www-form-urlencoded"),
159+
"X-Qiniu-Bbb" => array("BBB", "AAA"),
160+
"X-Qiniu-Aaa" => array("DDD", "CCC"),
161+
),
162+
"body" => "name=test&language=go",
163+
"expectedToken" => "ak:KUAhrYh32P9bv0COD8ugZjDCmII="
164+
),
165+
array(
166+
"url" => "http://upload.qiniup.com/mkfile/sdf.jpg",
167+
"method" => "",
168+
"headers" => array(
169+
"Content-Type" => array("application/x-www-form-urlencoded"),
170+
"X-Qiniu-Bbb" => array("BBB", "AAA"),
171+
"X-Qiniu-Aaa" => array("DDD", "CCC"),
172+
"X-Qiniu-" => array("a"),
173+
"X-Qiniu" => array("b"),
174+
),
175+
"body" => "name=test&language=go",
176+
"expectedToken" => "ak:fkRck5_LeyfwdkyyLk-hyNwGKac="
177+
),
178+
array(
179+
"url" => "http://upload.qiniup.com/mkfile/sdf.jpg?s=er3&df",
180+
"method" => "",
181+
"headers" => array(
182+
"Content-Type" => array("application/x-www-form-urlencoded"),
183+
"X-Qiniu-Bbb" => array("BBB", "AAA"),
184+
"X-Qiniu-Aaa" => array("DDD", "CCC"),
185+
"X-Qiniu-" => array("a"),
186+
"X-Qiniu" => array("b"),
187+
),
188+
"body" => "name=test&language=go",
189+
"expectedToken" => "ak:PUFPWsEUIpk_dzUvvxTTmwhp3p4="
190+
)
191+
);
192+
193+
foreach ($testCases as $testCase) {
194+
list($sign, $err) = $auth->signQiniuAuthorization(
195+
$testCase["url"],
196+
$testCase["method"],
197+
$testCase["body"],
198+
new Header($testCase["headers"])
199+
);
200+
201+
$this->assertNull($err);
202+
$this->assertEquals($testCase["expectedToken"], $sign);
203+
}
207204
}
208205

209206
public function testDisableQiniuTimestampSignatureDefault()

0 commit comments

Comments
 (0)