Skip to content

Commit 9aafa1c

Browse files
ArlodotexeArlodotexe
committed
Cleanup tests
1 parent 4acdc9f commit 9aafa1c

File tree

6 files changed

+21
-117
lines changed

6 files changed

+21
-117
lines changed

‎test/BlockTest.cs‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎test/CoreApi/BitswapApiTest.cs‎

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
using Ipfs.Http;
2-
using Microsoft.VisualStudio.TestTools.UnitTesting;
3-
using System;
4-
using System.IO;
5-
using System.Linq;
6-
using System.Text;
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
72
using System.Threading.Tasks;
83

94
namespace Ipfs.Http
@@ -13,56 +8,6 @@ public class BitswapApiTest
138
{
149
private IpfsClient ipfs = TestFixture.Ipfs;
1510

16-
[TestMethod]
17-
public async Task Wants()
18-
{
19-
var block = new DagNode(Encoding.UTF8.GetBytes("BitswapApiTest unknown block"));
20-
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
21-
Task.Run(() => ipfs.Bitswap.GetAsync(block.Id).Wait());
22-
23-
var endTime = DateTime.Now.AddSeconds(10);
24-
while (DateTime.Now < endTime)
25-
{
26-
await Task.Delay(100);
27-
var wants = await ipfs.Bitswap.WantsAsync();
28-
if (wants.Contains(block.Id))
29-
return;
30-
}
31-
Assert.Fail("wanted block is missing");
32-
}
33-
34-
[TestMethod]
35-
[Ignore("https://github.com/ipfs/go-ipfs/issues/5295")]
36-
public async Task Unwant()
37-
{
38-
var block = new DagNode(Encoding.UTF8.GetBytes("BitswapApiTest unknown block 2"));
39-
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
40-
Task.Run(() => ipfs.Bitswap.GetAsync(block.Id).Wait());
41-
42-
var endTime = DateTime.Now.AddSeconds(10);
43-
while (true)
44-
{
45-
if (DateTime.Now > endTime)
46-
Assert.Fail("wanted block is missing");
47-
await Task.Delay(100);
48-
var wants = await ipfs.Bitswap.WantsAsync();
49-
if (wants.Contains(block.Id))
50-
break;
51-
}
52-
53-
await ipfs.Bitswap.UnwantAsync(block.Id);
54-
endTime = DateTime.Now.AddSeconds(10);
55-
while (true)
56-
{
57-
if (DateTime.Now > endTime)
58-
Assert.Fail("unwanted block is present");
59-
await Task.Delay(100);
60-
var wants = await ipfs.Bitswap.WantsAsync();
61-
if (!wants.Contains(block.Id))
62-
break;
63-
}
64-
}
65-
6611
[TestMethod]
6712
public async Task Ledger()
6813
{

‎test/CoreApi/BlockApiTest.cs‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,14 @@ public async Task Put_Bytes()
2222
Assert.AreEqual(id, (string)cid);
2323

2424
var data = await ipfs.Block.GetAsync(cid);
25-
Assert.AreEqual(blob.Length, data.Size);
25+
Assert.AreEqual<int>(blob.Length, data.Length);
2626

2727
var stream = await ipfs.FileSystem.ReadFileAsync(cid);
28-
var
29-
CollectionAssert.AreEqual(blob, );
28+
using var memoryStream = new MemoryStream();
29+
await stream.CopyToAsync(memoryStream);
30+
var bytes = memoryStream.ToArray();
31+
32+
CollectionAssert.AreEqual(blob, bytes);
3033
}
3134

3235
[TestMethod]
@@ -36,8 +39,8 @@ public void Put_Bytes_ContentType()
3639
Assert.AreEqual("bafkreiaxnnnb7qz2focittuqq3ya25q7rcv3bqynnczfzako47346wosmu", (string)cid);
3740

3841
var data = ipfs.Block.GetAsync(cid).Result;
39-
Assert.AreEqual(blob.Length, data.Size);
40-
CollectionAssert.AreEqual(blob, data.DataBytes);
42+
Assert.AreEqual<int>(blob.Length, data.Length);
43+
CollectionAssert.AreEqual(blob, data);
4144
}
4245

4346
[TestMethod]
@@ -47,8 +50,8 @@ public void Put_Bytes_Hash()
4750
Assert.AreEqual("bafkrgqelljziv4qfg5mefz36m2y3h6voaralnw6lwb4f53xcnrf4mlsykkn7vt6eno547tw5ygcz62kxrle45wnbmpbofo5tvu57jvuaf7k7e", (string)cid);
4851

4952
var data = ipfs.Block.GetAsync(cid).Result;
50-
Assert.AreEqual(blob.Length, data.Size);
51-
CollectionAssert.AreEqual(blob, data.DataBytes);
53+
Assert.AreEqual<int>(blob.Length, data.Length);
54+
CollectionAssert.AreEqual(blob, data);
5255
}
5356

5457
[TestMethod]
@@ -72,8 +75,8 @@ public void Put_Stream()
7275
Assert.AreEqual(id, (string)cid);
7376

7477
var data = ipfs.Block.GetAsync(cid).Result;
75-
Assert.AreEqual(blob.Length, data.Size);
76-
CollectionAssert.AreEqual(blob, data.DataBytes);
78+
Assert.AreEqual<int>(blob.Length, data.Length);
79+
CollectionAssert.AreEqual(blob, data);
7780
}
7881

7982
[TestMethod]
@@ -83,8 +86,8 @@ public void Put_Stream_ContentType()
8386
Assert.AreEqual("bafkreiaxnnnb7qz2focittuqq3ya25q7rcv3bqynnczfzako47346wosmu", (string)cid);
8487

8588
var data = ipfs.Block.GetAsync(cid).Result;
86-
Assert.AreEqual(blob.Length, data.Size);
87-
CollectionAssert.AreEqual(blob, data.DataBytes);
89+
Assert.AreEqual(blob.Length, data.Length);
90+
CollectionAssert.AreEqual(blob, data);
8891
}
8992

9093
[TestMethod]
@@ -94,8 +97,8 @@ public void Put_Stream_Hash()
9497
Assert.AreEqual("bafkrgqelljziv4qfg5mefz36m2y3h6voaralnw6lwb4f53xcnrf4mlsykkn7vt6eno547tw5ygcz62kxrle45wnbmpbofo5tvu57jvuaf7k7e", (string)cid);
9598

9699
var data = ipfs.Block.GetAsync(cid).Result;
97-
Assert.AreEqual(blob.Length, data.Size);
98-
CollectionAssert.AreEqual(blob, data.DataBytes);
100+
Assert.AreEqual<int>(blob.Length, data.Length);
101+
CollectionAssert.AreEqual(blob, data);
99102
}
100103

101104
[TestMethod]
@@ -117,10 +120,9 @@ public void Get()
117120
{
118121
var _ = ipfs.Block.PutAsync(blob).Result;
119122
var block = ipfs.Block.GetAsync(id).Result;
120-
Assert.AreEqual(id, (string)block.Id);
121-
CollectionAssert.AreEqual(blob, block.DataBytes);
123+
CollectionAssert.AreEqual(blob, block);
124+
122125
var blob1 = new byte[blob.Length];
123-
block.DataStream.Read(blob1, 0, blob1.Length);
124126
CollectionAssert.AreEqual(blob, blob1);
125127
}
126128

‎test/CoreApi/FileSystemApiTest.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ public void AddDirectoryRecursive()
236236
var xfiles = new FileSystemNode
237237
{
238238
Id = files[2].Id,
239-
IpfsClient = ipfs,
240239
}.Links.ToArray();
241240
Assert.AreEqual(2, xfiles.Length);
242241
Assert.AreEqual("x.txt", xfiles[0].Name);
@@ -245,17 +244,15 @@ public void AddDirectoryRecursive()
245244
var yfiles = new FileSystemNode
246245
{
247246
Id = xfiles[1].Id,
248-
IpfsClient = ipfs
249247
}.Links.ToArray();
250248
Assert.AreEqual(1, yfiles.Length);
251249
Assert.AreEqual("y.txt", yfiles[0].Name);
252250

253251
var y = new FileSystemNode
254252
{
255253
Id = yfiles[0].Id,
256-
IpfsClient = ipfs
257254
};
258-
Assert.AreEqual("y", Encoding.UTF8.GetString(y.DataBytes));
255+
259256
Assert.AreEqual("y", ipfs.FileSystem.ReadAllTextAsync(dir.Id + "/x/y/y.txt").Result);
260257
}
261258
finally

‎test/FileSystemNodeTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public async Task Serialization()
1515
var a = await ipfs.FileSystem.AddTextAsync("hello world");
1616
Assert.AreEqual("Qmf412jQZiuVUtdgnB36FXFX7xg5V6KEbSJ4dpQuhkLyfD", (string)a.Id);
1717

18-
var b = await ipfs.FileSystem.ListFileAsync(a.Id);
18+
var b = await ipfs.FileSystem.ListAsync(a.Id);
1919
var json = JsonConvert.SerializeObject(b);
2020
var c = JsonConvert.DeserializeObject<FileSystemNode>(json);
2121
Assert.AreEqual(b.Id, c.Id);

‎test/MerkleNodeTest.cs‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -105,24 +105,5 @@ public void Value_Equality()
105105
Assert.IsFalse(nullNode != null);
106106
Assert.IsTrue(null != a0);
107107
}
108-
109-
[TestMethod]
110-
public void DataBytes()
111-
{
112-
var node = new MerkleNode(IpfsInfo);
113-
byte[] data = node.DataBytes;
114-
Assert.AreEqual(node.BlockSize, data.Length);
115-
}
116-
117-
[TestMethod]
118-
public void DataStream()
119-
{
120-
var node = new MerkleNode(IpfsInfo);
121-
byte[] data = node.DataBytes;
122-
var streamData = new MemoryStream();
123-
node.DataStream.CopyTo(streamData);
124-
CollectionAssert.AreEqual(data, streamData.ToArray());
125-
}
126-
127108
}
128109
}

0 commit comments

Comments
 (0)