Skip to content

Commit 15e12c4

Browse files
jemygrawjemygraw
committed
update bucket manager and resume upload test case
1 parent 0212d56 commit 15e12c4

File tree

2 files changed

+97
-42
lines changed

2 files changed

+97
-42
lines changed

‎src/QiniuTests/Storage/BucketManagerTests.cs‎

Lines changed: 96 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,22 @@ namespace Qiniu.Storage.Tests
99
[TestFixture]
1010
public class BucketManagerTests : TestEnv
1111
{
12-
private BucketManager bucketManager;
13-
[OneTimeSetUp]
14-
public void Init()
15-
{
16-
Config config = new Config();
17-
Mac mac = new Mac(AccessKey, SecretKey);
18-
this.bucketManager = new BucketManager(mac, config);
19-
}
2012

2113
[Test]
2214
public void ChgmTest()
2315
{
16+
Config config = new Config();
17+
Mac mac = new Mac(AccessKey, SecretKey);
18+
BucketManager bucketManager = new BucketManager(mac, config);
2419
string key = "qiniu.png";
2520
string newMime = "image/x-png";
26-
HttpResult chgmRet = this.bucketManager.ChangeMime(Bucket, key, newMime);
21+
HttpResult chgmRet = bucketManager.ChangeMime(Bucket, key, newMime);
2722
if (chgmRet.Code != (int)HttpCode.OK)
2823
{
2924
Assert.Fail("chgm error: " + chgmRet.ToString());
3025
}
3126

32-
StatResult statRet = this.bucketManager.Stat(Bucket, key);
27+
StatResult statRet = bucketManager.Stat(Bucket, key);
3328
if (!statRet.Result.MimeType.Equals(newMime))
3429
{
3530
Assert.Fail("stat error: " + statRet.ToString());
@@ -39,8 +34,11 @@ public void ChgmTest()
3934
[Test]
4035
public void StatTest()
4136
{
37+
Config config = new Config();
38+
Mac mac = new Mac(AccessKey, SecretKey);
39+
BucketManager bucketManager = new BucketManager(mac, config);
4240
string key = "qiniu.png";
43-
StatResult statRet = this.bucketManager.Stat(Bucket, key);
41+
StatResult statRet = bucketManager.Stat(Bucket, key);
4442
if (statRet.Code != (int)HttpCode.OK)
4543
{
4644
Assert.Fail("stat error: " + statRet.ToString());
@@ -55,7 +53,10 @@ public void StatTest()
5553
[Test]
5654
public void BucketsTest()
5755
{
58-
BucketsResult ret = this.bucketManager.Buckets(true);
56+
Config config = new Config();
57+
Mac mac = new Mac(AccessKey, SecretKey);
58+
BucketManager bucketManager = new BucketManager(mac, config);
59+
BucketsResult ret = bucketManager.Buckets(true);
5960
if (ret.Code != (int)HttpCode.OK)
6061
{
6162
Assert.Fail("buckets error: " + ret.ToString());
@@ -70,9 +71,12 @@ public void BucketsTest()
7071
[Test]
7172
public void DeleteTest()
7273
{
74+
Config config = new Config();
75+
Mac mac = new Mac(AccessKey, SecretKey);
76+
BucketManager bucketManager = new BucketManager(mac, config);
7377
string newKey = "qiniu-to-delete.png";
74-
this.bucketManager.Copy(Bucket, "qiniu.png", Bucket, newKey);
75-
HttpResult deleteRet = this.bucketManager.Delete(Bucket, newKey);
78+
bucketManager.Copy(Bucket, "qiniu.png", Bucket, newKey);
79+
HttpResult deleteRet = bucketManager.Delete(Bucket, newKey);
7680
if (deleteRet.Code != (int)HttpCode.OK)
7781
{
7882
Assert.Fail("delete error: " + deleteRet.ToString());
@@ -82,8 +86,11 @@ public void DeleteTest()
8286
[Test]
8387
public void CopyTest()
8488
{
89+
Config config = new Config();
90+
Mac mac = new Mac(AccessKey, SecretKey);
91+
BucketManager bucketManager = new BucketManager(mac, config);
8592
string newKey = "qiniu-to-copy.png";
86-
HttpResult copyRet = this.bucketManager.Copy(Bucket, "qiniu.png", Bucket, newKey, true);
93+
HttpResult copyRet = bucketManager.Copy(Bucket, "qiniu.png", Bucket, newKey, true);
8794
if (copyRet.Code != (int)HttpCode.OK)
8895
{
8996
Assert.Fail("copy error: " + copyRet.ToString());
@@ -94,15 +101,18 @@ public void CopyTest()
94101
[Test]
95102
public void MoveTest()
96103
{
104+
Config config = new Config();
105+
Mac mac = new Mac(AccessKey, SecretKey);
106+
BucketManager bucketManager = new BucketManager(mac, config);
97107
string newKey = "qiniu-to-copy.png";
98-
HttpResult copyRet = this.bucketManager.Copy(Bucket, "qiniu.png", Bucket, newKey, true);
108+
HttpResult copyRet = bucketManager.Copy(Bucket, "qiniu.png", Bucket, newKey, true);
99109
if (copyRet.Code != (int)HttpCode.OK)
100110
{
101111
Assert.Fail("copy error: " + copyRet.ToString());
102112
}
103113
Console.WriteLine(copyRet.ToString());
104114

105-
HttpResult moveRet = this.bucketManager.Move(Bucket, newKey, Bucket, "qiniu-move-target.png", true);
115+
HttpResult moveRet = bucketManager.Move(Bucket, newKey, Bucket, "qiniu-move-target.png", true);
106116
if (moveRet.Code != (int)HttpCode.OK)
107117
{
108118
Assert.Fail("move error: " + moveRet.ToString());
@@ -113,7 +123,10 @@ public void MoveTest()
113123
[Test]
114124
public void ChangeMimeTest()
115125
{
116-
HttpResult ret = this.bucketManager.ChangeMime(Bucket, "qiniu.png", "image/x-png");
126+
Config config = new Config();
127+
Mac mac = new Mac(AccessKey, SecretKey);
128+
BucketManager bucketManager = new BucketManager(mac, config);
129+
HttpResult ret = bucketManager.ChangeMime(Bucket, "qiniu.png", "image/x-png");
117130
if (ret.Code != (int)HttpCode.OK)
118131
{
119132
Assert.Fail("change mime error: " + ret.ToString());
@@ -124,7 +137,10 @@ public void ChangeMimeTest()
124137
[Test]
125138
public void ChangeTypeTest()
126139
{
127-
HttpResult ret = this.bucketManager.ChangeType(Bucket, "qiniu.png", 1);
140+
Config config = new Config();
141+
Mac mac = new Mac(AccessKey, SecretKey);
142+
BucketManager bucketManager = new BucketManager(mac, config);
143+
HttpResult ret = bucketManager.ChangeType(Bucket, "qiniu.png", 1);
128144
if (ret.Code != (int)HttpCode.OK && !ret.Text.Contains("already in line stat"))
129145
{
130146
Assert.Fail("change type error: " + ret.ToString());
@@ -135,14 +151,17 @@ public void ChangeTypeTest()
135151
[Test]
136152
public void DeleteAfterDaysTest()
137153
{
154+
Config config = new Config();
155+
Mac mac = new Mac(AccessKey, SecretKey);
156+
BucketManager bucketManager = new BucketManager(mac, config);
138157
string newKey = "qiniu-to-copy.png";
139-
HttpResult copyRet = this.bucketManager.Copy(Bucket, "qiniu.png", Bucket, newKey, true);
158+
HttpResult copyRet = bucketManager.Copy(Bucket, "qiniu.png", Bucket, newKey, true);
140159
if (copyRet.Code != (int)HttpCode.OK)
141160
{
142161
Assert.Fail("copy error: " + copyRet.ToString());
143162
}
144163
Console.WriteLine(copyRet.ToString());
145-
HttpResult expireRet = this.bucketManager.DeleteAfterDays(Bucket, newKey, 7);
164+
HttpResult expireRet = bucketManager.DeleteAfterDays(Bucket, newKey, 7);
146165
if (expireRet.Code != (int)HttpCode.OK)
147166
{
148167
Assert.Fail("deleteAfterDays error: " + expireRet.ToString());
@@ -153,7 +172,10 @@ public void DeleteAfterDaysTest()
153172
[Test]
154173
public void PrefetchTest()
155174
{
156-
HttpResult ret = this.bucketManager.Prefetch(Bucket, "qiniu.png");
175+
Config config = new Config();
176+
Mac mac = new Mac(AccessKey, SecretKey);
177+
BucketManager bucketManager = new BucketManager(mac, config);
178+
HttpResult ret = bucketManager.Prefetch(Bucket, "qiniu.png");
157179
if (ret.Code != (int)HttpCode.OK && !ret.Text.Contains("bucket source not set"))
158180
{
159181
Assert.Fail("prefetch error: " + ret.ToString());
@@ -164,7 +186,10 @@ public void PrefetchTest()
164186
[Test]
165187
public void DomainsTest()
166188
{
167-
DomainsResult ret = this.bucketManager.Domains(Bucket);
189+
Config config = new Config();
190+
Mac mac = new Mac(AccessKey, SecretKey);
191+
BucketManager bucketManager = new BucketManager(mac, config);
192+
DomainsResult ret = bucketManager.Domains(Bucket);
168193
if (ret.Code != (int)HttpCode.OK)
169194
{
170195
Assert.Fail("domains error: " + ret.ToString());
@@ -176,15 +201,18 @@ public void DomainsTest()
176201
[Test]
177202
public void FetchTest()
178203
{
204+
Config config = new Config();
205+
Mac mac = new Mac(AccessKey, SecretKey);
206+
BucketManager bucketManager = new BucketManager(mac, config);
179207
string resUrl = "http://devtools.qiniu.com/qiniu.png";
180-
FetchResult ret = this.bucketManager.Fetch(resUrl, Bucket, "qiniu-fetch.png");
208+
FetchResult ret = bucketManager.Fetch(resUrl, Bucket, "qiniu-fetch.png");
181209
if (ret.Code != (int)HttpCode.OK)
182210
{
183211
Assert.Fail("fetch error: " + ret.ToString());
184212
}
185213
Console.WriteLine(ret.ToString());
186214

187-
ret = this.bucketManager.Fetch(resUrl, Bucket, null);
215+
ret = bucketManager.Fetch(resUrl, Bucket, null);
188216
if (ret.Code != (int)HttpCode.OK)
189217
{
190218
Assert.Fail("fetch error: " + ret.ToString());
@@ -195,11 +223,14 @@ public void FetchTest()
195223
[Test]
196224
public void ListFilesTest()
197225
{
226+
Config config = new Config();
227+
Mac mac = new Mac(AccessKey, SecretKey);
228+
BucketManager bucketManager = new BucketManager(mac, config);
198229
string prefix = "";
199230
string delimiter = "";
200231
int limit = 100;
201232
string marker = "";
202-
ListResult listRet = this.bucketManager.ListFiles(Bucket, prefix, marker, limit, delimiter);
233+
ListResult listRet = bucketManager.ListFiles(Bucket, prefix, marker, limit, delimiter);
203234
if (listRet.Code != (int)HttpCode.OK)
204235
{
205236
Assert.Fail("list files error: " + listRet.ToString());
@@ -210,13 +241,16 @@ public void ListFilesTest()
210241
[Test]
211242
public void ListBucketTest()
212243
{
244+
Config config = new Config();
245+
Mac mac = new Mac(AccessKey, SecretKey);
246+
BucketManager bucketManager = new BucketManager(mac, config);
213247
string prefix = "";
214248
string delimiter = "";
215249
int limit = 100;
216250
string marker = "";
217251
do
218252
{
219-
ListResult listRet = this.bucketManager.ListFiles(Bucket, prefix, marker, limit, delimiter);
253+
ListResult listRet = bucketManager.ListFiles(Bucket, prefix, marker, limit, delimiter);
220254
if (listRet.Code != (int)HttpCode.OK)
221255
{
222256
Assert.Fail("list files error: " + listRet.ToString());
@@ -232,6 +266,9 @@ public void ListBucketTest()
232266
[Test]
233267
public void BatchStatTest()
234268
{
269+
Config config = new Config();
270+
Mac mac = new Mac(AccessKey, SecretKey);
271+
BucketManager bucketManager = new BucketManager(mac, config);
235272
BatchCopyTest();
236273
string[] keys = {
237274
"qiniu-0.png",
@@ -242,11 +279,11 @@ public void BatchStatTest()
242279
List<string> ops = new List<string>();
243280
foreach (string key in keys)
244281
{
245-
string op = this.bucketManager.StatOp(Bucket, key);
282+
string op = bucketManager.StatOp(Bucket, key);
246283
ops.Add(op);
247284
}
248285

249-
BatchResult ret = this.bucketManager.Batch(ops);
286+
BatchResult ret = bucketManager.Batch(ops);
250287
if (ret.Code / 100 != 2)
251288
{
252289
Assert.Fail("batch error: " + ret.ToString());
@@ -268,6 +305,9 @@ public void BatchStatTest()
268305
[Test]
269306
public void BatchDeleteTest()
270307
{
308+
Config config = new Config();
309+
Mac mac = new Mac(AccessKey, SecretKey);
310+
BucketManager bucketManager = new BucketManager(mac, config);
271311
BatchCopyTest();
272312
string[] keys = {
273313
"qiniu-0.png",
@@ -278,11 +318,11 @@ public void BatchDeleteTest()
278318
List<string> ops = new List<string>();
279319
foreach (string key in keys)
280320
{
281-
string op = this.bucketManager.DeleteOp(Bucket, key);
321+
string op = bucketManager.DeleteOp(Bucket, key);
282322
ops.Add(op);
283323
}
284324

285-
BatchResult ret = this.bucketManager.Batch(ops);
325+
BatchResult ret = bucketManager.Batch(ops);
286326
if (ret.Code / 100 != 2)
287327
{
288328
Assert.Fail("batch error: " + ret.ToString());
@@ -303,6 +343,9 @@ public void BatchDeleteTest()
303343
[Test]
304344
public void BatchCopyTest()
305345
{
346+
Config config = new Config();
347+
Mac mac = new Mac(AccessKey, SecretKey);
348+
BucketManager bucketManager = new BucketManager(mac, config);
306349
string[] keys = {
307350
"qiniu-0.png",
308351
"qiniu-1.png",
@@ -312,11 +355,11 @@ public void BatchCopyTest()
312355
List<string> ops = new List<string>();
313356
foreach (string key in keys)
314357
{
315-
string op = this.bucketManager.CopyOp(Bucket, "qiniu.png", Bucket, key, true);
358+
string op = bucketManager.CopyOp(Bucket, "qiniu.png", Bucket, key, true);
316359
ops.Add(op);
317360
}
318361

319-
BatchResult ret = this.bucketManager.Batch(ops);
362+
BatchResult ret = bucketManager.Batch(ops);
320363
if (ret.Code / 100 != 2)
321364
{
322365
Assert.Fail("batch error: " + ret.ToString());
@@ -337,6 +380,9 @@ public void BatchCopyTest()
337380
[Test]
338381
public void BatchMoveTest()
339382
{
383+
Config config = new Config();
384+
Mac mac = new Mac(AccessKey, SecretKey);
385+
BucketManager bucketManager = new BucketManager(mac, config);
340386
BatchCopyTest();
341387
string[] keys = {
342388
"qiniu-0.png",
@@ -347,11 +393,11 @@ public void BatchMoveTest()
347393
List<string> ops = new List<string>();
348394
foreach (string key in keys)
349395
{
350-
string op = this.bucketManager.MoveOp(Bucket, key, Bucket, key + "-batch-move", true);
396+
string op = bucketManager.MoveOp(Bucket, key, Bucket, key + "-batch-move", true);
351397
ops.Add(op);
352398
}
353399

354-
BatchResult ret = this.bucketManager.Batch(ops);
400+
BatchResult ret = bucketManager.Batch(ops);
355401
if (ret.Code / 100 != 2)
356402
{
357403
Assert.Fail("batch error: " + ret.ToString());
@@ -372,6 +418,9 @@ public void BatchMoveTest()
372418
[Test]
373419
public void BatchChangeMimeTest()
374420
{
421+
Config config = new Config();
422+
Mac mac = new Mac(AccessKey, SecretKey);
423+
BucketManager bucketManager = new BucketManager(mac, config);
375424
BatchCopyTest();
376425
string[] keys = {
377426
"qiniu-0.png",
@@ -382,11 +431,11 @@ public void BatchChangeMimeTest()
382431
List<string> ops = new List<string>();
383432
foreach (string key in keys)
384433
{
385-
string op = this.bucketManager.ChangeMimeOp(Bucket, key, "image/batch-x-png");
434+
string op = bucketManager.ChangeMimeOp(Bucket, key, "image/batch-x-png");
386435
ops.Add(op);
387436
}
388437

389-
BatchResult ret = this.bucketManager.Batch(ops);
438+
BatchResult ret = bucketManager.Batch(ops);
390439
if (ret.Code / 100 != 2)
391440
{
392441
Assert.Fail("batch error: " + ret.ToString());
@@ -407,6 +456,9 @@ public void BatchChangeMimeTest()
407456
[Test]
408457
public void BatchChangeTypeTest()
409458
{
459+
Config config = new Config();
460+
Mac mac = new Mac(AccessKey, SecretKey);
461+
BucketManager bucketManager = new BucketManager(mac, config);
410462
BatchCopyTest();
411463
string[] keys = {
412464
"qiniu-0.png",
@@ -417,11 +469,11 @@ public void BatchChangeTypeTest()
417469
List<string> ops = new List<string>();
418470
foreach (string key in keys)
419471
{
420-
string op = this.bucketManager.ChangeTypeOp(Bucket, key, 0);
472+
string op = bucketManager.ChangeTypeOp(Bucket, key, 0);
421473
ops.Add(op);
422474
}
423475

424-
BatchResult ret = this.bucketManager.Batch(ops);
476+
BatchResult ret = bucketManager.Batch(ops);
425477
if (ret.Code / 100 != 2)
426478
{
427479
Assert.Fail("batch error: " + ret.ToString());
@@ -442,6 +494,9 @@ public void BatchChangeTypeTest()
442494
[Test]
443495
public void BatchDeleteAfterDaysTest()
444496
{
497+
Config config = new Config();
498+
Mac mac = new Mac(AccessKey, SecretKey);
499+
BucketManager bucketManager = new BucketManager(mac, config);
445500
BatchCopyTest();
446501
string[] keys = {
447502
"qiniu-0.png",
@@ -452,11 +507,11 @@ public void BatchDeleteAfterDaysTest()
452507
List<string> ops = new List<string>();
453508
foreach (string key in keys)
454509
{
455-
string op = this.bucketManager.DeleteAfterDaysOp(Bucket, key, 7);
510+
string op = bucketManager.DeleteAfterDaysOp(Bucket, key, 7);
456511
ops.Add(op);
457512
}
458513

459-
BatchResult ret = this.bucketManager.Batch(ops);
514+
BatchResult ret = bucketManager.Batch(ops);
460515
if (ret.Code / 100 != 2)
461516
{
462517
Assert.Fail("batch error: " + ret.ToString());

0 commit comments

Comments
 (0)